commit 9fdaede3f70489398cd2dc276c961bc9d5c8f691
parent 8361e3c4abf1f75af51225f428bd22c1bb04ffcd
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Jun 2020 14:08:42 -0400
Remove AssumeReachable from TestingTorNetwork.
Closes ticket 34446.
Diffstat:
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/ticket34446 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
@@ -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
@@ -2,7 +2,6 @@
// for 'TestingTorNetwork' in 'doc/tor.1.txt'
{ "DirAllowPrivateAddresses", "1" },
{ "EnforceDistinctSubnets", "0" },
-{ "AssumeReachable", "1" },
{ "AuthDirMaxServersPerAddr", "0" },
{ "ClientBootstrapConsensusAuthorityDownloadInitialDelay", "0" },
{ "ClientBootstrapConsensusFallbackDownloadInitialDelay", "0" },