tor-commits July 2020

tor-commits@lists.torproject.org

17 participants
2100 discussions

[tor/master] Merge branch 'maint-0.4.4'
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit d7f3d1196c7bf962125fdc165492623c12359679 Merge: e4bfa734a 562957e0d Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:25:26 2020 -0400 Merge branch 'maint-0.4.4' changes/ticket33873 | 4 ++++ src/core/or/connection_edge.c | 5 ++++- src/test/test_hs_common.c | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.4] socks: Returns 0xF6 only if BAD_HOSTNAME
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit 562957e0db200ea58fcf878d61314d3a2b0c297c Author: Guinness <guinness(a)crans.org> Date: Wed Jul 8 17:46:16 2020 +0200 socks: Returns 0xF6 only if BAD_HOSTNAME This commit modifies the behavior of `parse_extended_address` in such a way that if it fails, it will always return a `BAD_HOSTNAME` value, which is then used to return the 0xF6 extended error code. This way, in any case that is not a valid v2 address, we return the 0xF6 error code, which is the expected behavior. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket33873 | 4 ++++ src/core/or/connection_edge.c | 5 ++++- src/test/test_hs_common.c | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/changes/ticket33873 b/changes/ticket33873 new file mode 100644 index 000000000..c45191181 --- /dev/null +++ b/changes/ticket33873 @@ -0,0 +1,4 @@ + o Minor bugfix (SOCKS, onion service client): + - Also detect bad v3 onion service address of the wrong length when + returning the F6 ExtendedErrors code. Fixes bug 33873; bugfix on + 0.4.3.1-alpha. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index fc77db833..26595003c 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1663,6 +1663,9 @@ parse_extended_hostname(char *address, hostname_type_t *type_out) log_warn(LD_APP, "Invalid %shostname %s; rejecting", is_onion ? "onion " : "", safe_str_client(address)); + if (*type_out == ONION_V3_HOSTNAME) { + *type_out = BAD_HOSTNAME; + } return false; } @@ -2139,7 +2142,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, if (!parse_extended_hostname(socks->address, &addresstype)) { control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); - if (addresstype == ONION_V3_HOSTNAME) { + if (addresstype == BAD_HOSTNAME) { conn->socks_request->socks_extended_error_code = SOCKS5_HS_BAD_ADDRESS; } connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL); diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 4a161db33..9202074e2 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -792,6 +792,8 @@ test_parse_extended_hostname(void *arg) "www.25njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid.onion"; char address9[] = "www.15njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid.onion"; + char address10[] = + "15njqamcweflpvkl73j4szahhihoc4xt3ktcgjnpaingr5yhkenl5sid7jdl.onion"; tt_assert(!parse_extended_hostname(address1, &type)); tt_int_op(type, OP_EQ, BAD_HOSTNAME); @@ -824,7 +826,11 @@ test_parse_extended_hostname(void *arg) /* Invalid v3 address. */ tt_assert(!parse_extended_hostname(address9, &type)); - tt_int_op(type, OP_EQ, ONION_V3_HOSTNAME); + tt_int_op(type, OP_EQ, BAD_HOSTNAME); + + /* Invalid v3 address: too long */ + tt_assert(!parse_extended_hostname(address10, &type)); + tt_int_op(type, OP_EQ, BAD_HOSTNAME); done: ; }

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

commit 990ae1b027e01575d7085eb3980bef6e43f6da04 Merge: d97360498 562957e0d Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Jul 9 07:25:26 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket33873 | 4 ++++ src/core/or/connection_edge.c | 5 ++++- src/test/test_hs_common.c | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-)

1 0

[tor/master] socks: Returns 0xF6 only if BAD_HOSTNAME
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

1 0

[tor/release-0.4.4] socks: Returns 0xF6 only if BAD_HOSTNAME
by dgoulet＠torproject.org 09 Jul '20

09 Jul '20

1 0

[sbws/master] fix: tests: Create new authority keys
by juga＠torproject.org 09 Jul '20

09 Jul '20

commit 9cc24476ef170bb186f2f9d2529bb5aa6aaa0883 Author: juga0 <juga(a)riseup.net> Date: Mon Jun 8 15:55:18 2020 +0000 fix: tests: Create new authority keys because they expired. They will expire again in a year. Implementing #33150 and using chutney would avoid to update keys. Closes #34394. --- tests/integration/conftest.py | 6 +- .../net/auth1/keys/authority_certificate | 65 +++++++++--------- .../net/auth1/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth1/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth1/torrc | 6 +- .../net/auth2/keys/authority_certificate | 65 +++++++++--------- .../net/auth2/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth2/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth2/torrc | 6 +- .../net/auth3/keys/authority_certificate | 65 +++++++++--------- .../net/auth3/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth3/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth3/torrc | 8 +-- tests/integration/net/exit1/torrc | 9 ++- tests/integration/net/exit2/torrc | 9 ++- tests/integration/net/exit3/torrc | 9 ++- tests/integration/net/relay1/torrc | 9 ++- tests/integration/net/relay1mbyteMAB/torrc | 10 +-- tests/integration/net/relay1mbyteRBR/torrc | 10 +-- tests/integration/net/relay2/torrc | 9 ++- tests/integration/net/relay3/torrc | 9 ++- tests/integration/net/relay4/torrc | 9 ++- tests/integration/net/relay5/torrc | 9 ++- tests/integration/net/relay6/torrc | 9 ++- tests/integration/net/relay7/torrc | 9 ++- tests/integration/sbws_testnet.ini | 8 +-- 26 files changed, 355 insertions(+), 368 deletions(-) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 170ea51..afd7256 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -78,9 +78,9 @@ def conf(sbwshome_dir): # the request would hang. conf['destinations.foo']['url'] = 'http://127.0.0.1:28888/sbws.bin' conf['tor']['extra_lines'] = """ # noqa: E501 -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 diff --git a/tests/integration/net/auth1/keys/authority_certificate b/tests/integration/net/auth1/keys/authority_certificate index 7797dc0..c59fad5 100644 --- a/tests/integration/net/auth1/keys/authority_certificate +++ b/tests/integration/net/auth1/keys/authority_certificate @@ -1,46 +1,45 @@ dir-key-certificate-version 3 -dir-address 127.10.0.1:2003 -fingerprint D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD -dir-key-published 2018-06-01 15:55:49 -dir-key-expires 2020-06-01 15:55:49 +fingerprint 3668D8876241ADD04B53CAB08E7442BDE6EC9A06 +dir-key-published 2020-06-08 15:17:09 +dir-key-expires 2021-06-08 15:17:09 dir-identity-key -----BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEAsIDnUuNB5InQb7ipbXwLpIEtkFowYfkjqFlUVCh9LkMoOzlPcQOd -opYDjCD9DLuzMG+d37Q+50V08z2NHOzlRre8RwXvAyPoDoWtPLvvrHetBScZjYYP -Y1FqUsooD1O9hANN/sTcVYxVIALLYHnxoQMcZciYh4cGriKqxQb3jaRaxVVmH/K4 -PCQ8h+Tlak9t3IXwb9hE4EuwMQVid99Q5ke24Az6hcmAaMia5MILyxybycomHgNK -fj7Awym1oRvZV1ZH8SVmP3si9Y8NFT1+l+HhwmCX7001uwjIhRiScOAvLU6NJQJN -Y8KAWzMwsfFu347lIwU7+tJnF4GjDGvUMYS0Jl/FGPOsgTxfpFfOa+l3DzZ3PUK/ -4looiS3K+8snObiw18iq0U/J1FfRPQ3te2nsDS+NFFWrTyCjz7LfjnaeIRHu2FFu -782s9SDYIzi43HmWEm4klQB/4H1l4Na/evbl5b+ky99Ar2TI8x4ZBu40wC1gbuG5 -w81nbF51eGYPAgMBAAE= +MIIBigKCAYEA2Us9kIWgU5135VjC7/kLWqIaTZ4STmg7UvNlabr6naPE0ATOpEc6 +Z58HNkVDxfAxge8uk58lim/mifw18PHeWhjU3dWNF4JLzoWoHIZ3fmea22xz8IzT +9mnSrVtOb8yGjqrSQwhB78Aq/y1eHGGwkAWYe7AT+ytIIYRVU05l7J4q3TqYI/D+ +V8LIu8h1vrlUPp3vhxAxelu/iykb45b2g775AMyodLZQnA86/00FJDUMt/3C2mKc +fhXV7zlhZxo92iJ2aEkl94p+6PR2CurtHCv2yj1dA8ZS80Jc+npaveVbYbMxlyPU +QujLb3cv4lTDNGxQ4azsm6gv2uZbqErCmZSfLQrRfg3tMy6OhV5sXsxzOiDJj8rV +fDQQV++EbJhHhoWb+jrkTn7AoZWryniZOdh5CZ3SroICzjsvLif8bLF5g5kgh2ic +fMkf1U10AF8Lh4UzGAQw1OUsP6ffcolaCv7iOCD9YgAOZHTTe05Kz7rhaE+uT+em +sM4ZQhgGFj9BAgMBAAE= -----END RSA PUBLIC KEY----- dir-signing-key -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAs3yPEimVwdNSu+48MPBbqAscL7ETps2gMF/7NFtGK++4GU5TQ4iV -zfjqzhV4n0CcCuQ+UGB6kzr7ZCsd84KI2fVbIZaxtD++Zb+jc8bRTp+Lz27J5FDd -LTKCZ32EiBoTiVME7zfVHHdxS2aa2L2/KqWO5BDDjB7kn0UoN6yE4aWvE1y3iXQl -uZCWXryc6ZfF46355aBqGKb1Ru0fJSrsE/spdiymMfGpOedsa0jgZf3GohkRukUl -lCblFgpSjJalw6V2uWi7g7qC3w8K10YGgBvNNNPuLrwcbrE9IaO2DFRFZokZM2l4 -y91DQfYkQrDGG/hAkX1oN565/eeH6FhltQIDAQAB +MIIBCgKCAQEAxcZ1sPDjdapTgNm7s4pC5d9ITjE0jwjR3HULsOQpp31M904T9V/z +R/POA4IXB+GpplzoE/9vv4TR9O9RRiL7r+8jQ+D3KUSMa6OspC+ZCJ1kAZIpQQ6m +c5DDAa0HvZHxj4WNATPTmzx6DVRkGviO7To2KlXRSqUgZ5NqT2ay70tXgfxzL/dF +wGD3dd3uOj5I0D47v+Cq3Eb/uvoAQY2wTcO+Lxmvrrq+6nRucIwGEALmBE3o9uBB +010vy56JTmYRNScaf8rB1Kv+qcxidZYST+JIyI/MfNnl5Q5O9bLZPqyST+CqiOb5 +PUr4+O4ViOqGcX/FInQ+0To1IOL+Zhy0sQIDAQAB -----END RSA PUBLIC KEY----- dir-key-crosscert -----BEGIN ID SIGNATURE----- -Ow60/hsr5EQMOtKZEbr/MncxzQxbDbSy+pTJrFCYXamwKgmN5CX0ZaPnWbVJsmSe -fLV8izHtx75x80oFXt2cqbY792uLWp9O/8S2YhvGSOgRPJ0edUZtbfkxgA0ConYa -FkikHND/pulK2XgaX1oC7ZLqchA6fTLuca9xFA34n/1/yEr5PyLwEicF8GrR8/ir -LnRRv6aiQSf6ZJetctep31Bzrs9WYggXK2JCst49hqkJbiiGVrpmzlRpo9MajP0z -IwpDAlzKnuKFRMftBinh42+kgIKyQBgYwyJAzh31wuFY3b8zaImi4dKwzHdzksuz -Uh6XrheAfVDXOEeNxCbFgQ== +I4CmfExP01dupA5UeSBZhLKdLQGqAZajYb1OaIQ353Ts9+F6cx7xf7k7aEepxuqi +33a2M6M8OECbjB41U/R0b2aRI7t1n0fpMrQ4O0PcSYletAltPxSJrZjr1HPRvJmT +NzWF5IJYjvkge01QNksdsOheYmAXgDlkq8+bsSh6mny07FzNUlVPxPAoy3MAnuyV +wbSZEwCHH6Ca9O94cz8Hnou/1B+bZ3EefHMePcFCCNsYMtDDOqvxbjKTyb+yRvfm +dijqO9NmPBMxxT9T1kNEnH6Kd8ctoKTLTKOPTOdnkv4Mxp+XP4ne/q/P8+Xys+4D +pd3lA2uNrvOXgVzrUpbC0Q== -----END ID SIGNATURE----- dir-key-certification -----BEGIN SIGNATURE----- -kW6UWcYhRQn60GuUrRtbsJm8CaL42o2ywX121y4tSmGsTdmG/rs0Ve52fJvi2qOW -p93hecTEVLbsF7LFAM8454sW9BsfTQTZ0IDzg8F4wJ187m7EJMhTyO2twwXO+7x/ -fKV/4viHzLLSqLfW8txWeozazwC4B7VyH8WHxKK5/VhpQXgMlVaaTtzfEd67+AuJ -qnCNTxKeWXNGTblRXglL/K7MpP1MrQq0T8W4eEFYGhYT9aMM2wvKeC9YAl1xePdP -/yLH0Jj9iB+FjrSXUDHGyi0QRgSJMiAW2uZkTtODxUyt4i1yx55KKlK6jIgXu972 -O/O+5h6YTqfcvqFZDWaATZsbtX4HKNmF1cLfvX3XFpB3O+YgRaz9bh9yly334UPk -J2gYduqikYu6yYwIdrsPeT7aLjGh829P+BYUgVkbiDnIF/N9n8oQNivyX1qL2sm5 -O/JHog7BT6uuud3M6MuLvfZWqY5BtiYexVQhXBge6mcrjl64IK3T8unDluY4vhah +CPIHwIO7KiRnZnecJLzfBZxGVRlQLarC240pSxZEnJUhq+AP6MfQW4Sx3ttvjAfG +sLZEEt4LoMoOeNAmCttFDGjO4knoqV1LXlTBMdplzcj9g7yOeeQUzhvadjO7wA9/ +K01R/HW8JyvGECjLzIoxgNUTC7rLiGA+YHfExbiA8s96rZ67tV8Zts/W8aAboEcq +8bo4n6shVG3QXOTyECpBjrFSi4RwPYrMwJOtto8RbQY4HVbRwNFrOhliT0xAkvYo +4aDFKmixHpXeywXBJPKTpOWfsH0+8idzTKee9Zq9Ir1nvsjHiJo6VsKrBSOvAbAt +j+6CFPh3uwcOUFp0LZ9OkO+wKRXlyMBS4U+2AAL2oIq7ekTOd9sOo14Hl8sP78lW +nu2uG4+bUzsZolxCY9aHjcwC2xN4ZLFzPmjjnQu6CNNa/pjfP6ZdsZY58h6IO0aR +q4StS6wM8RYlQuGVY8io2K5R28T4bIt2ADPBXhNHqCkiYYlaFRv68Li1LXju/US4 -----END SIGNATURE----- diff --git a/tests/integration/net/auth1/keys/authority_identity_key b/tests/integration/net/auth1/keys/authority_identity_key index 1ccdcf5..5c0c5a9 100644 --- a/tests/integration/net/auth1/keys/authority_identity_key +++ b/tests/integration/net/auth1/keys/authority_identity_key @@ -1,41 +1,41 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -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 -UN35Z33vkMLm8ia2zHY= +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 +gWkgB314RFh5PpYVMRM= -----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/integration/net/auth1/keys/authority_signing_key b/tests/integration/net/auth1/keys/authority_signing_key index 5ae436e..25c34f4 100644 --- a/tests/integration/net/auth1/keys/authority_signing_key +++ b/tests/integration/net/auth1/keys/authority_signing_key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth1/torrc b/tests/integration/net/auth1/torrc index 59d7fcd..464a7fd 100644 --- a/tests/integration/net/auth1/torrc +++ b/tests/integration/net/auth1/torrc @@ -23,9 +23,9 @@ TestingV3AuthInitialDistDelay 2 V3AuthDistDelay 2 -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 diff --git a/tests/integration/net/auth2/keys/authority_certificate b/tests/integration/net/auth2/keys/authority_certificate index 6bbf2eb..930375b 100644 --- a/tests/integration/net/auth2/keys/authority_certificate +++ b/tests/integration/net/auth2/keys/authority_certificate @@ -1,46 +1,45 @@ dir-key-certificate-version 3 -dir-address 127.10.0.2:2003 -fingerprint 4EE103A081F400E6622F5461D51782B876BB5C24 -dir-key-published 2018-06-01 15:55:49 -dir-key-expires 2020-06-01 15:55:49 +fingerprint 100036EB705CDCFB1746B450C23B861F554A3630 +dir-key-published 2020-06-08 15:46:15 +dir-key-expires 2021-06-08 15:46:15 dir-identity-key -----BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEAskiPcxMAOY6BdDha1zEhsvxdNxWk+Fuhx8OEpk+Yn8UhT+8vOPci -KWRtrFQte6U2JKxvXkPqoS+r6j063cUW1S+No5LuLm3VZ/lbJPJr8T/4MFodBqJ/ -3JgUycQBiBepCJTH/IsgFjJKwjvVYQPmlRgnI0Eaxeelb/TslRan7C3oSmAQ7fMY -c7UgQWtZQGCtIh3ZjrL2NBneZVebVgYst+kv0GdTFBQ4Yf74CXo5k0Wk8KF7YCwR -BEtGcIHh98jFahS2n0PI5gjBTJDPuuLVBpjqQ+WlfYy2njQagevNZZuTWorewomY -kIcaWLCy69Semjz3CWeOgxXCm7bMQesQbqpKubTRG3CmjO7F2ycA1jP45tHEI95B -wy55S+MQFhWHwj+VdVSenIuVKDqbz0yg02MPwKysYI+6DnY5SDTAAjZ50d/5kcmi -QTnnIBdI26/KUDbZsYFb7BHuayKwSR2CcOfrjhXAhpAe200B49Q5S4jtrSIBUo3a -L7orVFAuYRsbAgMBAAE= +MIIBigKCAYEAsOq+19UQ03eJq8nJXLKGXHhdTwqABO5pqb1rfy7kObl6oNH1KdZD +e6x6DubGFRG287YuPn/wPs4QiDQnlkshOQ7Mro63rh9lBt02u5dcu49tGyLcWXdu +FMvzVavKuU3y58sF+5OdNP8u0RGz4o5b9jAkMWbi1UqtbUDFcufMbnEffskq5Wbf +BAxxvbVTIwkRjBPsR9JpQTVJf32YOivzcGmF0tfS8H+mtBySoCzWvSLnKisJ3yPF +fsD12ZevmQEYxvwi6RzD1hbqn9gmQZfrHTQ8sN/0kgt4enrxeC5piZKfih7z6d4n +Dkg5+78FDT6PBtX1hs99fQUqUE5lRr+pq+Y2tgd3H3TH3EQ5gUeGXZKa99Gy7lmZ +0oCn2StVS8cAf8CmHb3pz2xIeKZalctDf+oIqNEu/gAjLzGDqusQRpqe+XaEtQAl +Xl/yU2Kqar7qkqBhKiuw18hhZFZGlXm8QjqJ5RZe/nL3+MD6yB2651ZBYDkiNDCa +p2Iv2YDpZn63AgMBAAE= -----END RSA PUBLIC KEY----- dir-signing-key -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEArguSeQ8/hHeR2YXkwxeNJQXcU4ZyxVA/m1RF9eNznpzM22gP/y36 -FV2jgoFzGFcndSG3bD0x7SOvcLzilVAkurQm77+uuX2sBLZJSwwTHunRgCWxuRM6 -amPOfS9/K9G3h4CVSAVOteA43NPU2idMwu8QmfGOkdEfxTk8gtSqqRZiGIRPw8SH -LPp4lpu3P9e9MWUfTBh2Rrok5ELCbPTL3YquHmvMApeoXCi4HZLEMKWQRHqeOrfq -0eFIat26oFeRCBGFyMCKly9KkmsaOgeANmWS44lyIbYViWi6Wd8DBZyJeET2avCS -PTHuTveorCxEIKhn5i+S6x8YBgW9L+psbwIDAQAB +MIIBCgKCAQEA11aF5YyGT5NnlDcofP/qDhibwBvY5EVJavbnRRrq2C7nSX2F9hNg +DCTml92xJEDi7K5vM5V0DiqeP8YaAcoHnRAgNQwM2IasY8iRi6uFJAM1M5e4HhI6 +lMwavQshor4BuLLwcJJmlN2HpQr3QPhkYiO7ZMCgnL9DwvVds5D5pxZTbTs6FQ29 +LWG84NfOmoTPvqjboUW12E4REyEw+xjmxg+DDIAzJY5u4E14vyIfG84oF6kFog+S +yFRNnJc5xnWHL7GeZ0+OtfjfFGSMVgdLgLXFhjfXXQq8GqBayPUuO4eqyxdLJcqV +rZnO1Q6mL+hrXp4RKaLbZI+Y9btVD/1RfQIDAQAB -----END RSA PUBLIC KEY----- dir-key-crosscert -----BEGIN ID SIGNATURE----- -YDO98bj/jDxsj1qKmbnprUVsd66tEfCO/4cFR+8djEYlap6uhw1RsaOBIEAEyi6o -B9ZSStq/9WQDb8IQz7MTl0zPtUUnYGcJqmZirKr/bi8xQIbwDTFh5JfEcVGYiHC+ -tapqxXLOWyiOZKJLnLPLnHTzrT+HOncpJAi66vq2KGFWJ6c6QotLSiMgku1JoXif -YP2PCLxLSRR928gFoHy0/WcEEMC/vE40gSrIMQ86SCB4B7MNQ+ENRMMldqw4pJaA -6eGZCyIqININZXshqOXnt5whrAaD9+gFTrbmpX+4fdBmQNfk2ZXnnGC/mw4rCegw -8ivl3kDb++7cv1BBGgUXrA== +qdZQ28nYxQhV/ROioYIXpYilTs9K9XKNBLCStgKTjgwkO7SjlU6SUZmwDzAHBBsa +X2Rr3Prgj+CD7VGnSr452Pd2XHvbIL8BLElgRdVETCrgfRqyapQF9nk/ivJPGqB7 +2kQelIx8Sw3zmyLfGUpL0sb3rHeGcQrZlSjOEs7N97FSt7KLujIn0cTai4UDW81g +r48R/+HFDlKOSBdHj5n7AnhdHozUxAZdNrcyyh1SmG9wX1STmNeEKRj+c0qgGJAv +cFPPFGzTi0ePrnTC/HfWDbBCxy9uOlVgfChndWw9hUFQMqAi4+NJZtpp14MPTc1h +6cW4xq5ACq0frlZmgWPmQQ== -----END ID SIGNATURE----- dir-key-certification -----BEGIN SIGNATURE----- -jz0lA4wDbYQ2S8MILRZH869pjWIzH9SrioswiE4mvWbXmttiN865etqS8zWpJYru -Ck2IHEZVGxnZ5CKT/oMjQ72bNCzjHvDBPn4JnlBvnCRL7ph8PZLKtFeryc/3ZU1m -x5uGUjqtusMeoJnzC8aLR4fWZcjcAWjDyyFhFLoV76O/kQWJr7lBJRV8xAMjIRzu -XIo+nzXbHegi6d8RnptfKgqd+uw12jY1pb016Goixgs8dzMDDtbkxOD3Z/8wzUX2 -pP1+FaBZH+ydklA4FoXwNjND6g1nXDME6l+fAklBLjxOjrmAD/UiWe7G5cF3ktD8 -js8aJjuTiIUax3hj7yQzA4i/8MGG6DVIDKoWbsNADPH61JI+lGtuHSeQ8Glz+zJj -rK6Extqacd7YxwDLqvwPbWsoLlHZtAuXEyOE4Q7j8Eb4x9iblPsATMtcKC0wJtqa -Zgbpntd5mUr8CK7P0/idGM+s2MS7lQW33IAAUBsPUi+UbO1LpPk7hg8v1THy8wjk +psMOIdjpqEWtPmOTrqYBvh7y57KWfxarwyYFTYQ6cx+iBjWiEbT0Cx8tbs0H3Y4N +XlFqYLqgOM3SOXyPBJYVTrsunupmplofrG1XvSyJ9CssEKko4kZuKZTCZDXfeE6F +CHrjIlkpnFK5HiuAJ/guNXVkF713Ne0Obm1T76SYjcqaLqw1sMAG05bh96tWEurc +p4hrvhNPM3VWSPnXuK3abXWtAcP0SAAwFVCASO6vJD7Iczmnt5Of6eZIBnc5Ybrr +UN0wxBGw2wIz+lsFZpkAnCBVqq9M5bYG6jI7FM0jwNKza5BGgRzHLu7pcvKe0PTz +0YD14tOWZJsXzLvOf+xMi4QJKaR+7GHEnpIqABX+UMylIH7Hb+P/T43LHDQKaYvi +AtIz7+PXMv900LpGtFaH2UNEUp0Qf9deU2oygVG4RKgHPYhUiBXhoFbnvPn75e6S +a9IoZym6DvWSttNWH0gUntjDrNJoypwi9gR5/uIPW/DsYCBvm9v2IcJZQPCSmsCP -----END SIGNATURE----- diff --git a/tests/integration/net/auth2/keys/authority_identity_key b/tests/integration/net/auth2/keys/authority_identity_key index 42ce330..dcfa6fb 100644 --- a/tests/integration/net/auth2/keys/authority_identity_key +++ b/tests/integration/net/auth2/keys/authority_identity_key @@ -1,41 +1,41 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -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 -tKmy7xJz3KeNCK8abnE= +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 +7JtLaHY/M5uUoFvBcCw= -----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/integration/net/auth2/keys/authority_signing_key b/tests/integration/net/auth2/keys/authority_signing_key index 1a79901..93a3c8b 100644 --- a/tests/integration/net/auth2/keys/authority_signing_key +++ b/tests/integration/net/auth2/keys/authority_signing_key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth2/torrc b/tests/integration/net/auth2/torrc index 2a7c799..7e941ae 100644 --- a/tests/integration/net/auth2/torrc +++ b/tests/integration/net/auth2/torrc @@ -23,9 +23,9 @@ TestingV3AuthInitialDistDelay 2 V3AuthDistDelay 2 -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 diff --git a/tests/integration/net/auth3/keys/authority_certificate b/tests/integration/net/auth3/keys/authority_certificate index ee7ee3f..b40c537 100644 --- a/tests/integration/net/auth3/keys/authority_certificate +++ b/tests/integration/net/auth3/keys/authority_certificate @@ -1,46 +1,45 @@ dir-key-certificate-version 3 -dir-address 127.10.0.3:2003 -fingerprint 8B85069C7FC0593801E6491A34100264FCE28980 -dir-key-published 2018-06-01 15:55:49 -dir-key-expires 2020-06-01 15:55:49 +fingerprint 4EC8AA0B0F120205EEE32C9918F1D99214ADF518 +dir-key-published 2020-06-08 15:47:39 +dir-key-expires 2021-06-08 15:47:39 dir-identity-key -----BEGIN RSA PUBLIC KEY----- -MIIBigKCAYEAzt9HthC1wszRQ6CO3yzceu2ARDOR2FrHRohIbRDvNxMamz+T/CUb -63lcgY/ZAkun2DprrVGn69WvyhjpX6zwpLYVxA7pgzmTCAUuBhl/c9ZyWhe4yZqt -qc3eg0yDac1U+oTe8MAEqAZvLmB6uymc1xnoGAoPYmkk+V0rzaDib5sKNGklsLn9 -KerD8/h+OaTygj9O6L0aNoaxcCY42+3w43tn70rk85SBhN+EVnpvGewHCxyiP6ev -0jvRFg6GU6RrMFaN/YokYobnbHDIvaBWaYjRe9fWPBUpVWLdNvUDTOWZqeTlkVvk -K09OJ32mbKUPdKRIIDV/OGnK4WR3tQX4oW9vVUHjKAHajv/iGYuDEoui4G9Ovw4j -o0fosxETFvH9B/Qg7UT7rxOkVwX4P87sIV0Z1TwH4S7mIhTwhICD/MLm0m58j8MM -Qd5Rt+4QFEVYY8vswV7XiN3xHwsiMcR7MhhPLcaTG57rc1pAVVRJLAGf7NNptIED -dV9ha3ZFOClRAgMBAAE= +MIIBigKCAYEAn6jQf+AHPlQq3sgNgquy/4zxYfdeB0I34Kxfishc7kY2xbKWFxNQ +d+N0VD59J/ab4LrJKS4QKEZaaC3IG0tbWmH9TY7f27I4xADrDXIM5EQwOmi0+RxR +bTdua1xWNvbKLRScD+XZGll1ZbsYCuXfEclglMDwyj1NGqBvoELqkBzRAxJ0HW5v +yh8ocuX6qxwBt7B0pJv4VSOlHOYyQ/LemVrToZPoB3TyLkgMBY4wnDCIWkxgV6ON +IT/rK32lbxJ/IqcP+9XY+IGuYjcq72rhHoH/+2Vsb+67Nvdesv7M18tAcd3A3lrz +NgduRzA+CBQ6jtBbVPtW1K1LfknhRyR3lct0nDv9uvcsQXwSlmpu37p/aKJNVkPf +K0CIpN8E2z7xxnC1Z/C9tHrwZjSImRxx1RPvwv1NAab8LMZXw8coobnrhzZESXiu +ENxvHR4mB828cfJlsDe++FWItc3ey4NIV0/LDXCNp7aQJXP3hGSuWaQ9DgXbQ+NO +mwo7dBlJTxHLAgMBAAE= -----END RSA PUBLIC KEY----- dir-signing-key -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsFTr1o5iNvK0yqQRfNcUBk81BLNKI1Uv9uCy6mDdneYwKZqVeB5w -5NQe8qFSGWzLWWfi7ZdQaOPHRUJWqdtkuR6AFEh9Ws+wSU17Jd1uMKfVFQL0+4q9 -tt52yoCE2tJ2GFwcouirUGXCXFQbfCrmUWxajSgGpDGNvjf24td8kq/O53cl4gOp -d1Ubl2BsLxALUswRsurJqLt1r+WNKEV9gBXWavyWxZcOwBWUhExdWWVSlM2O2hYs -Dq/VV8MJHugHHAju0d7JYhCy8L4K/AsZJ9KDgAyXw7L7ur7vqIzX/EjqtOjPk+rK -dpe9d3SbxdHRN0hmwqx7n4zGDt0AD4sQ1QIDAQAB +MIIBCgKCAQEAoYNshRfn36fjb/cb4yUT8OhzRckLIZV2rY3jjAA7d5JFXUvomRUj +1KwoPK/G7xDXzBwu0Z6GNqPdnLD9exQWIYrtCMufVs2DReLi77SnUC7hflKCO0EW +2buRfTFlpO7KCeRfAZqG6OGh1oFA/IRvKkTwL5UpOxBjNfdmQBlWFHlkJwT4A8X2 +XGpI6+EHRtucdeZmh+op5FIgVWVINEv3t+AIKeW7v4eprAvUA18rG9kEP5wrcAxt +YDMvsy6dvRkYGZmaA2Ujhkd50ldNVUAsWRM0eIalTaLqksD6OtMOSPlfBnkLzOA3 +cliSA4ccl8wLTIb+K66UYSTRi4y+kg3hCwIDAQAB -----END RSA PUBLIC KEY----- dir-key-crosscert -----BEGIN ID SIGNATURE----- -dE7ZA/wt346dO3uGUMM3CGQjm4YbPO7OWqmTAk0ohIDgUWT3At2fsitT+4ayZLGB -EFL4yeeeaT3wYNb2kCW/JLI9x1bFXs+wO4CPLe70ynbk2uB9KIrOy4hH9EW7PpR5 -Ow1N/AzUm0CQQvLstLNbUEBl7rfS9edU4Mg1GZUQTM+CPWxUIlaTtAT858Nbor1q -vJE7B5nVmozpla//0rE9Vr8Yu7JGOnCYdO002uo92AkwuHiDfBUVmzhJqaV75hHC -3zrJIDdHtYpI9ctuUNanWjVksuCkN1SUWmFYJPDWSChXxll8EZTVtk3Z4G7Ddgcl -4WZ8tb5PbzFypt2DSbeqKQ== +OTyErZT61omvfcVFe8uJ21TDNEWq01dc+cl7wgwsl4zS3hbGhPEe6vBMcTBFYAeE +kZmKWFxGh+lQ8N0N2KthtbAbvnKAR8mg7vdfr3puLCjvuN32EcYQBxORnKY/8yg4 +ELbFSdUOD8WmwR+31aQ3EiKmXl7V3gxS5RLOh9A3qKmWH6cGXg+WHzeAlH+WjBx4 ++//8KLAbjziQRHZe30dmFsIue56tFzW8zQHzLrztFacfjhBu/9xIf2rfc/morOIZ +ESEk6q4xvW37LNnRWujO8uCjH8QPOFTbMwGIVFTQw/RCSoEWWtKgRE5H4udS/C65 +uQhcWmavjHEy7oDPTPW+Ew== -----END ID SIGNATURE----- dir-key-certification -----BEGIN SIGNATURE----- -ZQ5ZVR5cgYuDbg182OQRIri7Md/L+DIeCEf0ZuApMFytgTZOEExsmccJlIibrfzB -hFAvBuxN+WDATEawg4FltyXrgB8M3FDrYufBQua7v9ghtapxsxL4O+G02Rq6RTZ1 -NIV3eE034UOmZ33Jd6k1EcZykeu/wF3ThTtg1pM75g56zDXk9xn+MyRb1ja7Oor4 -mzTBncgjo7YBnmNN/eIpph445NiduC3BdrLEsrCJA5F1iCO6ubeKx9GLAMIGb+W/ -qIXiuUiCmgp+iPQoF1rYRRaUgfo9zysm7ikjiSe6rSifLPth06vGWvUgpG0xm2jr -96igZ9MsfF1loaMUV7g9MhTzDFRk+Fw/KrAPkXgisje3RNtaI3UiCqbs/Pq0x7nC -77S6B7dd9RkhtWmpGFnfqX5I/l+766xAGXMO9IPlRp0L6EcOhIA+7N93mGf9dCKv -85741ULH0pZrdglPkXXsNGv7EO01uKuSrTkjK8Z/7hM/mxib19O3CTI3eX1WPQPr +DqjpWpppryImpfM/Gp79seyLd71dT5vAvbcGo2molSFiXCpQ9GnlMcmTOGtsdc+z +h1KAt04FmYlzTUfh71uzRmB/vZ05rmZwEC90wKpxcpZCxvzMhe7+Z6pwbdfTyLBm +gpnF3bExwiFuhlSyclhhHKoh8cel5CXkU4UX4qjOshVBuPx1H7I6Nl5WmXn1JdYY +5L+8QY8quDMK6o180U5ola0cMnxI/84JStInx5cT7sv4hTykECIcBYFdy/BwblvY +CbM0SypchDx7cBn8nFWAhQOBtr+OEpx/YX6r2uGWGjA5p/RQnrbzNCICx+vmpYG6 +CY+vTNnTjdqS5bjAJF49TguSlluuurz67nTXKd8Y9dEMCsQJo+Mqw4oT+VQq6d7s +YZdFH8xRNgUxm8je+Mq0hppuJbn6cMElqp3HBuiBfCjKI+P1zkCv1PHjXwAElLaw +y2G9g3auuQWKq9TY9QhUWsztlZDyRtYAQy0J6z7mSCH0Mqk4VRqNcC7Sn+75+fDM -----END SIGNATURE----- diff --git a/tests/integration/net/auth3/keys/authority_identity_key b/tests/integration/net/auth3/keys/authority_identity_key index 53825ce..a8ae257 100644 --- a/tests/integration/net/auth3/keys/authority_identity_key +++ b/tests/integration/net/auth3/keys/authority_identity_key @@ -1,41 +1,41 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -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 -T5zlwSssCEGZ7wceiVs= +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 +gjIiz/wzF3urm/zIZ1U= -----END ENCRYPTED PRIVATE KEY----- diff --git a/tests/integration/net/auth3/keys/authority_signing_key b/tests/integration/net/auth3/keys/authority_signing_key index f396e33..294eb8e 100644 --- a/tests/integration/net/auth3/keys/authority_signing_key +++ b/tests/integration/net/auth3/keys/authority_signing_key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/integration/net/auth3/torrc b/tests/integration/net/auth3/torrc index b44e74f..2ee6c60 100644 --- a/tests/integration/net/auth3/torrc +++ b/tests/integration/net/auth3/torrc @@ -22,10 +22,10 @@ V3AuthVoteDelay 2 TestingV3AuthInitialDistDelay 2 V3AuthDistDelay 2 - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 diff --git a/tests/integration/net/exit1/torrc b/tests/integration/net/exit1/torrc index 2b5ec45..89ba9bf 100644 --- a/tests/integration/net/exit1/torrc +++ b/tests/integration/net/exit1/torrc @@ -15,13 +15,12 @@ DirPort 127.10.0.11:2003 Nickname exit1 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/exit2/torrc b/tests/integration/net/exit2/torrc index b93c8d1..c4c4708 100644 --- a/tests/integration/net/exit2/torrc +++ b/tests/integration/net/exit2/torrc @@ -15,13 +15,12 @@ DirPort 127.10.0.12:2003 Nickname exit2 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/exit3/torrc b/tests/integration/net/exit3/torrc index 542b4cc..622ef54 100644 --- a/tests/integration/net/exit3/torrc +++ b/tests/integration/net/exit3/torrc @@ -15,13 +15,12 @@ DirPort 127.10.0.13:2003 Nickname exit3 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay1/torrc b/tests/integration/net/relay1/torrc index 168a066..0a5ef3b 100644 --- a/tests/integration/net/relay1/torrc +++ b/tests/integration/net/relay1/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.4:2003 Nickname relay1 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay1mbyteMAB/torrc b/tests/integration/net/relay1mbyteMAB/torrc index 9ce35dd..192a48f 100644 --- a/tests/integration/net/relay1mbyteMAB/torrc +++ b/tests/integration/net/relay1mbyteMAB/torrc @@ -12,14 +12,14 @@ DirPort 127.10.0.14:2003 Nickname relay1mbyteMAB ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - + MaxAdvertisedBandwidth 1 MByte diff --git a/tests/integration/net/relay1mbyteRBR/torrc b/tests/integration/net/relay1mbyteRBR/torrc index 32bc762..4f345e6 100644 --- a/tests/integration/net/relay1mbyteRBR/torrc +++ b/tests/integration/net/relay1mbyteRBR/torrc @@ -12,14 +12,14 @@ DirPort 127.10.0.15:2003 Nickname relay1mbyteRBR ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - + RelayBandwidthRate 1 MByte diff --git a/tests/integration/net/relay2/torrc b/tests/integration/net/relay2/torrc index 9ed9774..bc333ec 100644 --- a/tests/integration/net/relay2/torrc +++ b/tests/integration/net/relay2/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.5:2003 Nickname relay2 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay3/torrc b/tests/integration/net/relay3/torrc index 5606b0d..29526a4 100644 --- a/tests/integration/net/relay3/torrc +++ b/tests/integration/net/relay3/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.6:2003 Nickname relay3 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay4/torrc b/tests/integration/net/relay4/torrc index c71bee5..8444566 100644 --- a/tests/integration/net/relay4/torrc +++ b/tests/integration/net/relay4/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.7:2003 Nickname relay4 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay5/torrc b/tests/integration/net/relay5/torrc index 9c56b02..894be6a 100644 --- a/tests/integration/net/relay5/torrc +++ b/tests/integration/net/relay5/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.8:2003 Nickname relay5 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay6/torrc b/tests/integration/net/relay6/torrc index d2a3dad..a86d48c 100644 --- a/tests/integration/net/relay6/torrc +++ b/tests/integration/net/relay6/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.9:2003 Nickname relay6 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/net/relay7/torrc b/tests/integration/net/relay7/torrc index b299d7e..12d8609 100644 --- a/tests/integration/net/relay7/torrc +++ b/tests/integration/net/relay7/torrc @@ -12,13 +12,12 @@ DirPort 127.10.0.10:2003 Nickname relay7 ContactInfo pastly(a)torproject.org - -DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 -DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + +DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 +DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 LogTimeGranularity 1 SafeLogging 0 - diff --git a/tests/integration/sbws_testnet.ini b/tests/integration/sbws_testnet.ini index 32fa1af..ecae641 100644 --- a/tests/integration/sbws_testnet.ini +++ b/tests/integration/sbws_testnet.ini @@ -19,12 +19,12 @@ country = ZZ [tor] extra_lines = - DirAuthority auth1 orport=2002 no-v2 v3ident=D7DBC517EFD2BA1A5012CF1BD0BB38F17C8160BD 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 - DirAuthority auth2 orport=2002 no-v2 v3ident=4EE103A081F400E6622F5461D51782B876BB5C24 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 - DirAuthority auth3 orport=2002 no-v2 v3ident=8B85069C7FC0593801E6491A34100264FCE28980 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C + DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 + DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 + DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C TestingTorNetwork 1 NumCPUs 1 [logging] level = debug -to_stdout_level = ${level} \ No newline at end of file +to_stdout_level = ${level}

1 0

[sbws/master] Merge branch 'maint-1.1_bug34394' into 'maint-1.1'
by juga＠torproject.org 09 Jul '20

09 Jul '20

commit 3e86fd598c400c4934d105ff8f3c1c5895b2d55b Merge: 02861e1 a8c91d0 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jul 5 19:34:22 2020 +0000 Merge branch 'maint-1.1_bug34394' into 'maint-1.1' fix: tests: Create new authority keys Closes #33150 and #34394 See merge request tpo/network-health/sbws!10 tests/integration/conftest.py | 6 +- .../net/auth1/keys/authority_certificate | 65 +++++++++--------- .../net/auth1/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth1/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth1/torrc | 61 +++++++++-------- .../net/auth2/keys/authority_certificate | 65 +++++++++--------- .../net/auth2/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth2/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth2/torrc | 61 +++++++++-------- .../net/auth3/keys/authority_certificate | 65 +++++++++--------- .../net/auth3/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth3/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth3/torrc | 61 +++++++++-------- tests/integration/net/exit1/torrc | 49 +++++++------- tests/integration/net/exit2/torrc | 49 +++++++------- tests/integration/net/exit3/torrc | 49 +++++++------- tests/integration/net/relay1/torrc | 43 ++++++------ tests/integration/net/relay1mbyteMAB/torrc | 44 ++++++------ tests/integration/net/relay1mbyteRBR/torrc | 44 ++++++------ tests/integration/net/relay2/torrc | 43 ++++++------ tests/integration/net/relay3/torrc | 43 ++++++------ tests/integration/net/relay4/torrc | 43 ++++++------ tests/integration/net/relay5/torrc | 43 ++++++------ tests/integration/net/relay6/torrc | 43 ++++++------ tests/integration/net/relay7/torrc | 43 ++++++------ tests/integration/sbws_testnet.ini | 8 +-- 26 files changed, 648 insertions(+), 664 deletions(-)

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 09 Jul '20

09 Jul '20

commit 15fbb2bd3e290f30b18536d0822c703dbca65c4c Merge: c89a8a3 3e86fd5 Author: juga <juga(a)riseup.net> Date: Wed Jul 8 08:23:50 2020 +0000 Merge branch 'maint-1.1' tests/integration/conftest.py | 6 +- .../net/auth1/keys/authority_certificate | 65 +++++++++--------- .../net/auth1/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth1/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth1/torrc | 61 +++++++++-------- .../net/auth2/keys/authority_certificate | 65 +++++++++--------- .../net/auth2/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth2/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth2/torrc | 61 +++++++++-------- .../net/auth3/keys/authority_certificate | 65 +++++++++--------- .../net/auth3/keys/authority_identity_key | 78 +++++++++++----------- .../net/auth3/keys/authority_signing_key | 50 +++++++------- tests/integration/net/auth3/torrc | 61 +++++++++-------- tests/integration/net/exit1/torrc | 49 +++++++------- tests/integration/net/exit2/torrc | 49 +++++++------- tests/integration/net/exit3/torrc | 49 +++++++------- tests/integration/net/relay1/torrc | 43 ++++++------ tests/integration/net/relay1mbyteMAB/torrc | 44 ++++++------ tests/integration/net/relay1mbyteRBR/torrc | 44 ++++++------ tests/integration/net/relay2/torrc | 43 ++++++------ tests/integration/net/relay3/torrc | 43 ++++++------ tests/integration/net/relay4/torrc | 43 ++++++------ tests/integration/net/relay5/torrc | 43 ++++++------ tests/integration/net/relay6/torrc | 43 ++++++------ tests/integration/net/relay7/torrc | 43 ++++++------ tests/integration/sbws_testnet.ini | 8 +-- 26 files changed, 648 insertions(+), 664 deletions(-)

1 0

[sbws/master] fix: tests: Remove all the `\t` in torrc files
by juga＠torproject.org 09 Jul '20

09 Jul '20

commit a8c91d0baec7f77c69347bf676ca095175095030 Author: juga0 <juga(a)riseup.net> Date: Tue Jun 23 13:32:31 2020 +0000 fix: tests: Remove all the `\t` in torrc files at the beginning of the line and in empty lines. They are not needed. --- tests/integration/net/auth1/torrc | 55 +++++++++++++++--------------- tests/integration/net/auth2/torrc | 55 +++++++++++++++--------------- tests/integration/net/auth3/torrc | 55 +++++++++++++++--------------- tests/integration/net/exit1/torrc | 40 +++++++++++----------- tests/integration/net/exit2/torrc | 40 +++++++++++----------- tests/integration/net/exit3/torrc | 40 +++++++++++----------- tests/integration/net/relay1/torrc | 34 +++++++++--------- tests/integration/net/relay1mbyteMAB/torrc | 34 +++++++++--------- tests/integration/net/relay1mbyteRBR/torrc | 34 +++++++++--------- tests/integration/net/relay2/torrc | 34 +++++++++--------- tests/integration/net/relay3/torrc | 34 +++++++++--------- tests/integration/net/relay4/torrc | 34 +++++++++--------- tests/integration/net/relay5/torrc | 34 +++++++++--------- tests/integration/net/relay6/torrc | 34 +++++++++--------- tests/integration/net/relay7/torrc | 34 +++++++++--------- 15 files changed, 294 insertions(+), 297 deletions(-) diff --git a/tests/integration/net/auth1/torrc b/tests/integration/net/auth1/torrc index 464a7fd..1318647 100644 --- a/tests/integration/net/auth1/torrc +++ b/tests/integration/net/auth1/torrc @@ -1,34 +1,33 @@ - DataDirectory auth1 - PidFile auth1/tor.pid - Log notice file auth1/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.1 - SocksPort 127.10.0.1:2000 - ControlPort 127.10.0.1:2001 - CookieAuthentication 1 - ORPort 127.10.0.1:2002 - DirPort 127.10.0.1:2003 - Nickname auth1 - ContactInfo pastly(a)torproject.org - +DataDirectory auth1 +PidFile auth1/tor.pid +Log notice file auth1/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.1 +SocksPort 127.10.0.1:2000 +ControlPort 127.10.0.1:2001 +CookieAuthentication 1 +ORPort 127.10.0.1:2002 +DirPort 127.10.0.1:2003 +Nickname auth1 +ContactInfo pastly(a)torproject.org + + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2 - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/auth2/torrc b/tests/integration/net/auth2/torrc index 7e941ae..f3529e3 100644 --- a/tests/integration/net/auth2/torrc +++ b/tests/integration/net/auth2/torrc @@ -1,34 +1,33 @@ - DataDirectory auth2 - PidFile auth2/tor.pid - Log notice file auth2/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.2 - SocksPort 127.10.0.2:2000 - ControlPort 127.10.0.2:2001 - CookieAuthentication 1 - ORPort 127.10.0.2:2002 - DirPort 127.10.0.2:2003 - Nickname auth2 - ContactInfo pastly(a)torproject.org - +DataDirectory auth2 +PidFile auth2/tor.pid +Log notice file auth2/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.2 +SocksPort 127.10.0.2:2000 +ControlPort 127.10.0.2:2001 +CookieAuthentication 1 +ORPort 127.10.0.2:2002 +DirPort 127.10.0.2:2003 +Nickname auth2 +ContactInfo pastly(a)torproject.org + + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2 - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/auth3/torrc b/tests/integration/net/auth3/torrc index 2ee6c60..70ddf2e 100644 --- a/tests/integration/net/auth3/torrc +++ b/tests/integration/net/auth3/torrc @@ -1,34 +1,33 @@ - DataDirectory auth3 - PidFile auth3/tor.pid - Log notice file auth3/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.3 - SocksPort 127.10.0.3:2000 - ControlPort 127.10.0.3:2001 - CookieAuthentication 1 - ORPort 127.10.0.3:2002 - DirPort 127.10.0.3:2003 - Nickname auth3 - ContactInfo pastly(a)torproject.org - +DataDirectory auth3 +PidFile auth3/tor.pid +Log notice file auth3/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.3 +SocksPort 127.10.0.3:2000 +ControlPort 127.10.0.3:2001 +CookieAuthentication 1 +ORPort 127.10.0.3:2002 +DirPort 127.10.0.3:2003 +Nickname auth3 +ContactInfo pastly(a)torproject.org - TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2 DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit1/torrc b/tests/integration/net/exit1/torrc index 89ba9bf..10b22bd 100644 --- a/tests/integration/net/exit1/torrc +++ b/tests/integration/net/exit1/torrc @@ -1,26 +1,26 @@ - DataDirectory exit1 - PidFile exit1/tor.pid - Log notice file exit1/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.11 - SocksPort 127.10.0.11:2000 - ControlPort 127.10.0.11:2001 - CookieAuthentication 1 - ORPort 127.10.0.11:2002 - DirPort 127.10.0.11:2003 - Nickname exit1 - ContactInfo pastly(a)torproject.org +DataDirectory exit1 +PidFile exit1/tor.pid +Log notice file exit1/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.11 +SocksPort 127.10.0.11:2000 +ControlPort 127.10.0.11:2001 +CookieAuthentication 1 +ORPort 127.10.0.11:2002 +DirPort 127.10.0.11:2003 +Nickname exit1 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit2/torrc b/tests/integration/net/exit2/torrc index c4c4708..244b632 100644 --- a/tests/integration/net/exit2/torrc +++ b/tests/integration/net/exit2/torrc @@ -1,26 +1,26 @@ - DataDirectory exit2 - PidFile exit2/tor.pid - Log notice file exit2/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.12 - SocksPort 127.10.0.12:2000 - ControlPort 127.10.0.12:2001 - CookieAuthentication 1 - ORPort 127.10.0.12:2002 - DirPort 127.10.0.12:2003 - Nickname exit2 - ContactInfo pastly(a)torproject.org +DataDirectory exit2 +PidFile exit2/tor.pid +Log notice file exit2/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.12 +SocksPort 127.10.0.12:2000 +ControlPort 127.10.0.12:2001 +CookieAuthentication 1 +ORPort 127.10.0.12:2002 +DirPort 127.10.0.12:2003 +Nickname exit2 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit3/torrc b/tests/integration/net/exit3/torrc index 622ef54..ddfbcfe 100644 --- a/tests/integration/net/exit3/torrc +++ b/tests/integration/net/exit3/torrc @@ -1,26 +1,26 @@ - DataDirectory exit3 - PidFile exit3/tor.pid - Log notice file exit3/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.13 - SocksPort 127.10.0.13:2000 - ControlPort 127.10.0.13:2001 - CookieAuthentication 1 - ORPort 127.10.0.13:2002 - DirPort 127.10.0.13:2003 - Nickname exit3 - ContactInfo pastly(a)torproject.org +DataDirectory exit3 +PidFile exit3/tor.pid +Log notice file exit3/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.13 +SocksPort 127.10.0.13:2000 +ControlPort 127.10.0.13:2001 +CookieAuthentication 1 +ORPort 127.10.0.13:2002 +DirPort 127.10.0.13:2003 +Nickname exit3 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay1/torrc b/tests/integration/net/relay1/torrc index 0a5ef3b..bde5f91 100644 --- a/tests/integration/net/relay1/torrc +++ b/tests/integration/net/relay1/torrc @@ -1,23 +1,23 @@ - DataDirectory relay1 - PidFile relay1/tor.pid - Log notice file relay1/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.4 - SocksPort 127.10.0.4:2000 - ControlPort 127.10.0.4:2001 - CookieAuthentication 1 - ORPort 127.10.0.4:2002 - DirPort 127.10.0.4:2003 - Nickname relay1 - ContactInfo pastly(a)torproject.org +DataDirectory relay1 +PidFile relay1/tor.pid +Log notice file relay1/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.4 +SocksPort 127.10.0.4:2000 +ControlPort 127.10.0.4:2001 +CookieAuthentication 1 +ORPort 127.10.0.4:2002 +DirPort 127.10.0.4:2003 +Nickname relay1 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay1mbyteMAB/torrc b/tests/integration/net/relay1mbyteMAB/torrc index 192a48f..ed45e10 100644 --- a/tests/integration/net/relay1mbyteMAB/torrc +++ b/tests/integration/net/relay1mbyteMAB/torrc @@ -1,25 +1,25 @@ - DataDirectory relay1mbyteMAB - PidFile relay1mbyteMAB/tor.pid - Log notice file relay1mbyteMAB/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.14 - SocksPort 127.10.0.14:2000 - ControlPort 127.10.0.14:2001 - CookieAuthentication 1 - ORPort 127.10.0.14:2002 - DirPort 127.10.0.14:2003 - Nickname relay1mbyteMAB - ContactInfo pastly(a)torproject.org +DataDirectory relay1mbyteMAB +PidFile relay1mbyteMAB/tor.pid +Log notice file relay1mbyteMAB/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.14 +SocksPort 127.10.0.14:2000 +ControlPort 127.10.0.14:2001 +CookieAuthentication 1 +ORPort 127.10.0.14:2002 +DirPort 127.10.0.14:2003 +Nickname relay1mbyteMAB +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 MaxAdvertisedBandwidth 1 MByte diff --git a/tests/integration/net/relay1mbyteRBR/torrc b/tests/integration/net/relay1mbyteRBR/torrc index 4f345e6..bf27cc0 100644 --- a/tests/integration/net/relay1mbyteRBR/torrc +++ b/tests/integration/net/relay1mbyteRBR/torrc @@ -1,25 +1,25 @@ - DataDirectory relay1mbyteRBR - PidFile relay1mbyteRBR/tor.pid - Log notice file relay1mbyteRBR/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.15 - SocksPort 127.10.0.15:2000 - ControlPort 127.10.0.15:2001 - CookieAuthentication 1 - ORPort 127.10.0.15:2002 - DirPort 127.10.0.15:2003 - Nickname relay1mbyteRBR - ContactInfo pastly(a)torproject.org +DataDirectory relay1mbyteRBR +PidFile relay1mbyteRBR/tor.pid +Log notice file relay1mbyteRBR/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.15 +SocksPort 127.10.0.15:2000 +ControlPort 127.10.0.15:2001 +CookieAuthentication 1 +ORPort 127.10.0.15:2002 +DirPort 127.10.0.15:2003 +Nickname relay1mbyteRBR +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 RelayBandwidthRate 1 MByte diff --git a/tests/integration/net/relay2/torrc b/tests/integration/net/relay2/torrc index bc333ec..a3d49f1 100644 --- a/tests/integration/net/relay2/torrc +++ b/tests/integration/net/relay2/torrc @@ -1,23 +1,23 @@ - DataDirectory relay2 - PidFile relay2/tor.pid - Log notice file relay2/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.5 - SocksPort 127.10.0.5:2000 - ControlPort 127.10.0.5:2001 - CookieAuthentication 1 - ORPort 127.10.0.5:2002 - DirPort 127.10.0.5:2003 - Nickname relay2 - ContactInfo pastly(a)torproject.org +DataDirectory relay2 +PidFile relay2/tor.pid +Log notice file relay2/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.5 +SocksPort 127.10.0.5:2000 +ControlPort 127.10.0.5:2001 +CookieAuthentication 1 +ORPort 127.10.0.5:2002 +DirPort 127.10.0.5:2003 +Nickname relay2 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay3/torrc b/tests/integration/net/relay3/torrc index 29526a4..04d6a9f 100644 --- a/tests/integration/net/relay3/torrc +++ b/tests/integration/net/relay3/torrc @@ -1,23 +1,23 @@ - DataDirectory relay3 - PidFile relay3/tor.pid - Log notice file relay3/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.6 - SocksPort 127.10.0.6:2000 - ControlPort 127.10.0.6:2001 - CookieAuthentication 1 - ORPort 127.10.0.6:2002 - DirPort 127.10.0.6:2003 - Nickname relay3 - ContactInfo pastly(a)torproject.org +DataDirectory relay3 +PidFile relay3/tor.pid +Log notice file relay3/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.6 +SocksPort 127.10.0.6:2000 +ControlPort 127.10.0.6:2001 +CookieAuthentication 1 +ORPort 127.10.0.6:2002 +DirPort 127.10.0.6:2003 +Nickname relay3 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay4/torrc b/tests/integration/net/relay4/torrc index 8444566..8d7ffa2 100644 --- a/tests/integration/net/relay4/torrc +++ b/tests/integration/net/relay4/torrc @@ -1,23 +1,23 @@ - DataDirectory relay4 - PidFile relay4/tor.pid - Log notice file relay4/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.7 - SocksPort 127.10.0.7:2000 - ControlPort 127.10.0.7:2001 - CookieAuthentication 1 - ORPort 127.10.0.7:2002 - DirPort 127.10.0.7:2003 - Nickname relay4 - ContactInfo pastly(a)torproject.org +DataDirectory relay4 +PidFile relay4/tor.pid +Log notice file relay4/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.7 +SocksPort 127.10.0.7:2000 +ControlPort 127.10.0.7:2001 +CookieAuthentication 1 +ORPort 127.10.0.7:2002 +DirPort 127.10.0.7:2003 +Nickname relay4 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay5/torrc b/tests/integration/net/relay5/torrc index 894be6a..82d995d 100644 --- a/tests/integration/net/relay5/torrc +++ b/tests/integration/net/relay5/torrc @@ -1,23 +1,23 @@ - DataDirectory relay5 - PidFile relay5/tor.pid - Log notice file relay5/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.8 - SocksPort 127.10.0.8:2000 - ControlPort 127.10.0.8:2001 - CookieAuthentication 1 - ORPort 127.10.0.8:2002 - DirPort 127.10.0.8:2003 - Nickname relay5 - ContactInfo pastly(a)torproject.org +DataDirectory relay5 +PidFile relay5/tor.pid +Log notice file relay5/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.8 +SocksPort 127.10.0.8:2000 +ControlPort 127.10.0.8:2001 +CookieAuthentication 1 +ORPort 127.10.0.8:2002 +DirPort 127.10.0.8:2003 +Nickname relay5 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay6/torrc b/tests/integration/net/relay6/torrc index a86d48c..f33d71a 100644 --- a/tests/integration/net/relay6/torrc +++ b/tests/integration/net/relay6/torrc @@ -1,23 +1,23 @@ - DataDirectory relay6 - PidFile relay6/tor.pid - Log notice file relay6/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.9 - SocksPort 127.10.0.9:2000 - ControlPort 127.10.0.9:2001 - CookieAuthentication 1 - ORPort 127.10.0.9:2002 - DirPort 127.10.0.9:2003 - Nickname relay6 - ContactInfo pastly(a)torproject.org +DataDirectory relay6 +PidFile relay6/tor.pid +Log notice file relay6/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.9 +SocksPort 127.10.0.9:2000 +ControlPort 127.10.0.9:2001 +CookieAuthentication 1 +ORPort 127.10.0.9:2002 +DirPort 127.10.0.9:2003 +Nickname relay6 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay7/torrc b/tests/integration/net/relay7/torrc index 12d8609..d7a4842 100644 --- a/tests/integration/net/relay7/torrc +++ b/tests/integration/net/relay7/torrc @@ -1,23 +1,23 @@ - DataDirectory relay7 - PidFile relay7/tor.pid - Log notice file relay7/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.10 - SocksPort 127.10.0.10:2000 - ControlPort 127.10.0.10:2001 - CookieAuthentication 1 - ORPort 127.10.0.10:2002 - DirPort 127.10.0.10:2003 - Nickname relay7 - ContactInfo pastly(a)torproject.org +DataDirectory relay7 +PidFile relay7/tor.pid +Log notice file relay7/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.10 +SocksPort 127.10.0.10:2000 +ControlPort 127.10.0.10:2001 +CookieAuthentication 1 +ORPort 127.10.0.10:2002 +DirPort 127.10.0.10:2003 +Nickname relay7 +ContactInfo pastly(a)torproject.org DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C - TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0

1 0

[bridgedb/master] Merge branch 'enhancement/19774' into develop
by phw＠torproject.org 08 Jul '20

08 Jul '20

commit 6d3e899925854b0994d66551fef25678e6f36561 Merge: c45439c 20f1049 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Jun 4 14:05:25 2020 -0700 Merge branch 'enhancement/19774' into develop CHANGELOG | 3 +++ .../https/templates/assets/images/favicon.ico | Bin 0 -> 4286 bytes bridgedb/distributors/https/templates/base.html | 1 + setup.py | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2020