[tor-commits] [chutney/master] Make all networks have >=3 authorities.

[nickm at torproject.org]

commit 1e810b6dae86670fbdff2ef7d9a7a68b20c94abf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 15 13:51:59 2020 -0400

    Make all networks have >=3 authorities.
    
    When we fix #34446 in Tor, we will need to have at least three
    AssumeReachable relays on every network, or else Tor relays won't
    ever actually upload enough descriptors to build circuits, and so
    they won't upload their descriptors, and so on forever.
---
 networks/hs-v2-min                | 5 ++++-
 networks/hs-v23-ipv6-md           | 5 ++++-
 networks/hs-v23-min               | 5 ++++-
 networks/hs-v3-min                | 5 ++++-
 networks/mixed+hs-v23-ipv6        | 4 +++-
 networks/single-onion-v23         | 5 ++++-
 networks/single-onion-v23-ipv6-md | 5 ++++-
 7 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/networks/hs-v2-min b/networks/hs-v2-min
index e7eb52c..3f1cea8 100644
--- a/networks/hs-v2-min
+++ b/networks/hs-v2-min
@@ -16,7 +16,10 @@ HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 # connections:
 # a minimum path length of 3, plus the client-nominated rendezvous point,
 # plus a seperate introduction point
-NODES = Authority.getN(2) + NonExitRelay.getN(3) + \
+#
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority.getN(3) + NonExitRelay.getN(3) + \
         Client.getN(1) + HS.getN(1)
 
 ConfigureNodes(NODES)
diff --git a/networks/hs-v23-ipv6-md b/networks/hs-v23-ipv6-md
index ffe1b5b..2254309 100644
--- a/networks/hs-v23-ipv6-md
+++ b/networks/hs-v23-ipv6-md
@@ -26,7 +26,10 @@ HSv3IPv6 = Node(tag="h", hs=1, torrc="hs-v3-only-v6-md.tmpl")
 # connections:
 # a minimum path length of 3, plus the client-nominated rendezvous point,
 # plus a seperate introduction point
-NODES = Authority6.getN(2) + \
+#
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority6.getN(3) + \
         NonExitRelay6.getN(3) + \
         Client.getN(1) + Client6.getN(1) + \
         HSv2IPv6.getN(1) + HSv3IPv6.getN(1)
diff --git a/networks/hs-v23-min b/networks/hs-v23-min
index 5c6ac8e..de0ff16 100644
--- a/networks/hs-v23-min
+++ b/networks/hs-v23-min
@@ -15,7 +15,10 @@ HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 # connections:
 # a minimum path length of 3, plus the client-nominated rendezvous point,
 # plus a seperate introduction point
-NODES = Authority.getN(2) + NonExitRelay.getN(3) + \
+#
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority.getN(3) + NonExitRelay.getN(3) + \
         Client.getN(1) + HSv2.getN(1) + HSv3.getN(1)
 
 ConfigureNodes(NODES)
diff --git a/networks/hs-v3-min b/networks/hs-v3-min
index 56f15cb..e007f84 100644
--- a/networks/hs-v3-min
+++ b/networks/hs-v3-min
@@ -14,7 +14,10 @@ HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 # connections:
 # a minimum path length of 3, plus the client-nominated rendezvous point,
 # plus a seperate introduction point
-NODES = Authority.getN(2) + NonExitRelay.getN(3) + \
+#
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority.getN(3) + NonExitRelay.getN(3) + \
         Client.getN(1) + HS.getN(1)
 
 ConfigureNodes(NODES)
diff --git a/networks/mixed+hs-v23-ipv6 b/networks/mixed+hs-v23-ipv6
index 250bde1..5d9e2e3 100644
--- a/networks/mixed+hs-v23-ipv6
+++ b/networks/mixed+hs-v23-ipv6
@@ -51,7 +51,9 @@ OldHSv3IPv6 = Node(tag="hOLD", hs=1,
                  torrc="hs-v3-only-v6-md.tmpl",
                  tor=OLD_TOR)
 
-NODES = Authority6.getN(1)    + OldAuthority6.getN(1) + \
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority6.getN(2)    + OldAuthority6.getN(1) + \
         NonExitRelay.getN(1)  + OldNonExitRelay.getN(1) + \
         NonExitRelay6.getN(1) + OldNonExitRelay6.getN(1) + \
         Client6.getN(1)       + OldClient6.getN(1) + \
diff --git a/networks/single-onion-v23 b/networks/single-onion-v23
index 7afd6b9..f22fec6 100644
--- a/networks/single-onion-v23
+++ b/networks/single-onion-v23
@@ -12,7 +12,10 @@ SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl")
 # connections:
 # a minimum path length of 3, plus the client-nominated rendezvous point,
 # plus a seperate introduction point
-NODES = Authority.getN(2) + NonExitRelay.getN(3) + \
+#
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority.getN(3) + NonExitRelay.getN(3) + \
         Client.getN(1) + SingleOnionv2.getN(1) + SingleOnionv3.getN(1)
 
 ConfigureNodes(NODES)
diff --git a/networks/single-onion-v23-ipv6-md b/networks/single-onion-v23-ipv6-md
index bb76ed8..dff99ab 100644
--- a/networks/single-onion-v23-ipv6-md
+++ b/networks/single-onion-v23-ipv6-md
@@ -21,7 +21,10 @@ SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6-md.tmpl")
 # connections:
 # a minimum path length of 3, plus the client-nominated rendezvous point,
 # plus a seperate introduction point
-NODES = Authority6.getN(2) + NonExitRelay6.getN(3) + \
+#
+# (XXX We have temporarily added an extra authority to work around issue
+# 34447.)
+NODES = Authority6.getN(3) + NonExitRelay6.getN(3) + \
         Client.getN(1) + Client6.getN(1) + \
         SingleOnionv2IPv6.getN(1) + SingleOnionv3IPv6.getN(1)