Merge branch 'bug28590_rebased_master'

tests/integration/net.tar

tests/integration/net/auth1/fingerprint

tests/integration/net/auth1/keys/authority_certificate

tests/integration/net/auth1/keys/authority_identity_key

tests/integration/net/auth1/keys/authority_signing_key

...s/integration/net/auth1/keys/ed25519_master_id_public_key

...s/integration/net/auth1/keys/ed25519_master_id_secret_key

tests/integration/net/auth1/keys/ed25519_signing_cert

tests/integration/net/auth1/keys/ed25519_signing_secret_key

tests/integration/net/auth1/keys/secret_id_key

tests/integration/net/auth1/keys/secret_onion_key

tests/integration/net/auth1/keys/secret_onion_key_ntor

tests/integration/net/auth1/torrc

tests/integration/net/auth2/fingerprint

tests/integration/net/auth2/keys/authority_certificate

tests/integration/net/auth2/keys/authority_identity_key

tests/integration/net/auth2/keys/authority_signing_key

...s/integration/net/auth2/keys/ed25519_master_id_public_key

...s/integration/net/auth2/keys/ed25519_master_id_secret_key

tests/integration/net/auth2/keys/ed25519_signing_cert