commit 9fdaede3f70489398cd2dc276c961bc9d5c8f691 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 15 14:08:42 2020 -0400

Remove AssumeReachable from TestingTorNetwork.

Closes ticket 34446. --- changes/ticket34446 | 5 +++++ doc/tor.1.txt | 1 - src/app/config/testnet.inc | 1 - 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket34446 b/changes/ticket34446 new file mode 100644 index 000000000..2ec772312 --- /dev/null +++ b/changes/ticket34446 @@ -0,0 +1,5 @@ + o Minor features (testing configuration): + - The TestingTorNetwork no longer implicitly sets AssumeReachable to 1. + This change will allow us to test relays' self-testing mechanisms, + and eventually to test authorities' relay-testing functionality. + Closes ticket 34446. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f9e381265..15d5775e2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -3359,7 +3359,6 @@ The following options are used for running a testing Tor network.

DirAllowPrivateAddresses 1 EnforceDistinctSubnets 0 - AssumeReachable 1 AuthDirMaxServersPerAddr 0 ClientBootstrapConsensusAuthorityDownloadInitialDelay 0 ClientBootstrapConsensusFallbackDownloadInitialDelay 0 diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc index 907c35f97..605943d80 100644 --- a/src/app/config/testnet.inc +++ b/src/app/config/testnet.inc @@ -2,7 +2,6 @@ // for 'TestingTorNetwork' in 'doc/tor.1.txt' { "DirAllowPrivateAddresses", "1" }, { "EnforceDistinctSubnets", "0" }, -{ "AssumeReachable", "1" }, { "AuthDirMaxServersPerAddr", "0" }, { "ClientBootstrapConsensusAuthorityDownloadInitialDelay", "0" }, { "ClientBootstrapConsensusFallbackDownloadInitialDelay", "0" },