[tor-commits] [chutney/master] torrcs: Stop setting AssumeReachable on relays

[teor at torproject.org]

commit d7c14d5cfe490e8ea8cb4990b8206995cf8f5213
Author: teor <teor at torproject.org>
Date:   Thu Mar 12 15:57:58 2020 +1000

    torrcs: Stop setting AssumeReachable on relays
    
    Relays and bridges will now perform reachability self-checks, before
    publishing their descriptors.
    
    Continue to set "AssumeReachable 1" on authorities, to stop them doing
    authority to relay/bridge reachability checks. (These checks happen too
    slowly for chutney's test networks.)
    
    Part of 33583.
---
 torrc_templates/authority.i | 5 +++++
 torrc_templates/common.i    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i
index e44b0b6..a42023f 100644
--- a/torrc_templates/authority.i
+++ b/torrc_templates/authority.i
@@ -2,6 +2,11 @@ AuthoritativeDirectory 1
 V3AuthoritativeDirectory 1
 ContactInfo auth${nodenum}@test.test
 
+# Disable authority to relay/bridge reachability checks
+# These checks happen every half hour, even in testing networks
+# As of tor 0.4.3, there is no way to speed up these checks
+AssumeReachable 1
+
 # Speed up the consensus cycle as fast as it will go.
 # If clock desynchronisation is an issue, increase these voting times.
 
diff --git a/torrc_templates/common.i b/torrc_templates/common.i
index 8d5394c..de9e8ee 100644
--- a/torrc_templates/common.i
+++ b/torrc_templates/common.i
@@ -5,7 +5,7 @@ TestingTorNetwork 1
 # These parameters make tor networks bootstrap fast,
 # but can cause consensus instability and network unreliability
 # (Some are also bad for security.)
-AssumeReachable 1
+#
 # We need at least 3 descriptors to build circuits.
 # In a 3 relay network, 0.67 > 2/3, so we try hard to get 3 descriptors.
 # In larger networks, 0.67 > 2/N, so we try hard to get >=3 descriptors.