summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2020-05-21 16:24:32 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2020-05-21 16:24:32 +0300
commit3121e5c103473255002761ac9aed6874b10aa78d (patch)
treefae325d9c8fce58eb5e90902f23d7aca84688047 /src
parentfb281daf293f791999e3b1ead0f6dd77afd10eb1 (diff)
parentcc5319bf8e324f8beea01cf562de4b78f42a2917 (diff)
downloadtor-3121e5c103473255002761ac9aed6874b10aa78d.tar.gz
tor-3121e5c103473255002761ac9aed6874b10aa78d.zip
Merge branch 'tor-github/pr/1850'
Diffstat (limited to 'src')
-rw-r--r--src/app/config/testnet.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/config/testnet.inc b/src/app/config/testnet.inc
index f146a03cd1..907c35f97c 100644
--- a/src/app/config/testnet.inc
+++ b/src/app/config/testnet.inc
@@ -1,3 +1,5 @@
+// When modifying, don't forget to update the defaults
+// for 'TestingTorNetwork' in 'doc/tor.1.txt'
{ "DirAllowPrivateAddresses", "1" },
{ "EnforceDistinctSubnets", "0" },
{ "AssumeReachable", "1" },