commit c523619e20a91a1c6ec95b2230eec7060323cf15 Merge: 19fa738 df0a34f Author: juga0 juga@riseup.net Date: Wed Jan 23 15:23:27 2019 +0000

Merge branch 'bug28590_rebased_master'

tests/integration/net.tar | Bin 215040 -> 0 bytes tests/integration/net/auth1/fingerprint | 1 + .../net/auth1/keys/authority_certificate | 46 +++++++ .../net/auth1/keys/authority_identity_key | 41 +++++++ .../net/auth1/keys/authority_signing_key | 27 ++++ .../net/auth1/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/auth1/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/auth1/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/auth1/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/auth1/keys/secret_id_key | 15 +++ tests/integration/net/auth1/keys/secret_onion_key | 15 +++ .../net/auth1/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/auth1/torrc | 34 ++++++ tests/integration/net/auth2/fingerprint | 1 + .../net/auth2/keys/authority_certificate | 46 +++++++ .../net/auth2/keys/authority_identity_key | 41 +++++++ .../net/auth2/keys/authority_signing_key | 27 ++++ .../net/auth2/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/auth2/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/auth2/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/auth2/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/auth2/keys/secret_id_key | 15 +++ tests/integration/net/auth2/keys/secret_onion_key | 15 +++ .../net/auth2/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/auth2/torrc | 34 ++++++ tests/integration/net/auth3/fingerprint | 1 + .../net/auth3/keys/authority_certificate | 46 +++++++ .../net/auth3/keys/authority_identity_key | 41 +++++++ .../net/auth3/keys/authority_signing_key | 27 ++++ .../net/auth3/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/auth3/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/auth3/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/auth3/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/auth3/keys/secret_id_key | 15 +++ tests/integration/net/auth3/keys/secret_onion_key | 15 +++ .../net/auth3/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/auth3/torrc | 34 ++++++ tests/integration/net/exit1/fingerprint | 1 + .../net/exit1/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/exit1/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/exit1/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/exit1/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/exit1/keys/secret_id_key | 15 +++ tests/integration/net/exit1/keys/secret_onion_key | 15 +++ .../net/exit1/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/exit1/torrc | 27 ++++ tests/integration/net/exit2/fingerprint | 1 + .../net/exit2/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/exit2/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/exit2/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/exit2/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/exit2/keys/secret_id_key | 15 +++ tests/integration/net/exit2/keys/secret_onion_key | 15 +++ .../net/exit2/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/exit2/torrc | 27 ++++ tests/integration/net/exit3/fingerprint | 1 + .../net/exit3/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/exit3/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/exit3/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/exit3/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/exit3/keys/secret_id_key | 15 +++ tests/integration/net/exit3/keys/secret_onion_key | 15 +++ .../net/exit3/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/exit3/torrc | 27 ++++ tests/integration/net/relay1/fingerprint | 1 + .../net/relay1/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay1/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay1/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay1/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay1/keys/secret_id_key | 15 +++ tests/integration/net/relay1/keys/secret_onion_key | 15 +++ .../net/relay1/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay1/torrc | 24 ++++ tests/integration/net/relay1mbyteMAB/fingerprint | 1 + .../keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay1mbyteMAB/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../relay1mbyteMAB/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes .../net/relay1mbyteMAB/keys/secret_id_key | 15 +++ .../net/relay1mbyteMAB/keys/secret_onion_key | 15 +++ .../net/relay1mbyteMAB/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay1mbyteMAB/torrc | 25 ++++ tests/integration/net/relay1mbyteRBR/fingerprint | 1 + .../keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay1mbyteRBR/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../relay1mbyteRBR/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes .../net/relay1mbyteRBR/keys/secret_id_key | 15 +++ .../net/relay1mbyteRBR/keys/secret_onion_key | 15 +++ .../net/relay1mbyteRBR/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay1mbyteRBR/torrc | 25 ++++ tests/integration/net/relay2/fingerprint | 1 + .../net/relay2/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay2/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay2/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay2/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay2/keys/secret_id_key | 15 +++ tests/integration/net/relay2/keys/secret_onion_key | 15 +++ .../net/relay2/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay2/torrc | 24 ++++ tests/integration/net/relay3/fingerprint | 1 + .../net/relay3/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay3/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay3/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay3/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay3/keys/secret_id_key | 15 +++ tests/integration/net/relay3/keys/secret_onion_key | 15 +++ .../net/relay3/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay3/torrc | 24 ++++ tests/integration/net/relay4/fingerprint | 1 + .../net/relay4/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay4/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay4/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay4/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay4/keys/secret_id_key | 15 +++ tests/integration/net/relay4/keys/secret_onion_key | 15 +++ .../net/relay4/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay4/torrc | 24 ++++ tests/integration/net/relay5/fingerprint | 1 + .../net/relay5/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay5/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay5/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay5/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay5/keys/secret_id_key | 15 +++ tests/integration/net/relay5/keys/secret_onion_key | 15 +++ .../net/relay5/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay5/torrc | 24 ++++ tests/integration/net/relay6/fingerprint | 1 + .../net/relay6/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay6/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay6/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay6/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay6/keys/secret_id_key | 15 +++ tests/integration/net/relay6/keys/secret_onion_key | 15 +++ .../net/relay6/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay6/torrc | 24 ++++ tests/integration/net/relay7/fingerprint | 1 + .../net/relay7/keys/ed25519_master_id_public_key | Bin 0 -> 64 bytes .../net/relay7/keys/ed25519_master_id_secret_key | Bin 0 -> 96 bytes .../net/relay7/keys/ed25519_signing_cert | Bin 0 -> 172 bytes .../net/relay7/keys/ed25519_signing_secret_key | Bin 0 -> 96 bytes tests/integration/net/relay7/keys/secret_id_key | 15 +++ tests/integration/net/relay7/keys/secret_onion_key | 15 +++ .../net/relay7/keys/secret_onion_key_ntor | Bin 0 -> 96 bytes tests/integration/net/relay7/torrc | 24 ++++ tests/integration/net/start.sh | 15 +++ tests/integration/net/stop.sh | 4 + tests/integration/net/wait.py | 136 +++++++++++++++++++++ tox.ini | 5 +- 149 files changed, 1366 insertions(+), 2 deletions(-)