[tor-commits] [chutney/master] networks: Add an extra relay to client-ipv6-only*

[teor at torproject.org]

commit 53d229d9d9b02eae81e036a8e990e9f2fb01347f
Author: teor <teor at torproject.org>
Date:   Fri Feb 14 13:13:49 2020 +1000

    networks: Add an extra relay to client-ipv6-only*
    
    We need 5 relays in these networks, to avoid path building warnings on
    some nodes.
    
    Cleanup after Tor's 33280.
---
 networks/client-ipv6-only    | 2 +-
 networks/client-ipv6-only-md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/networks/client-ipv6-only b/networks/client-ipv6-only
index 305a4a5..5349c72 100644
--- a/networks/client-ipv6-only
+++ b/networks/client-ipv6-only
@@ -17,6 +17,6 @@ Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 
 # The minimum number of authorities/relays/exits is 3, the minimum path length
 # But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071)
-NODES = Authority6.getN(3) + ExitRelay6.getN(1) + HS.getN(1) + Client6.getN(1)
+NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1)
 
 ConfigureNodes(NODES)
diff --git a/networks/client-ipv6-only-md b/networks/client-ipv6-only-md
index 77b5bbe..ff7a664 100644
--- a/networks/client-ipv6-only-md
+++ b/networks/client-ipv6-only-md
@@ -17,6 +17,6 @@ Client6 = Node(tag="c", client=1, torrc="client-only-v6-md.tmpl")
 
 # The minimum number of authorities/relays/exits is 3, the minimum path length
 # But for some reason, Tor wants 4 "acceptable routers" (Tor bug #20071)
-NODES = Authority6.getN(3) + ExitRelay6.getN(1) + HS.getN(1) + Client6.getN(1)
+NODES = Authority6.getN(3) + ExitRelay6.getN(2) + HS.getN(1) + Client6.getN(1)
 
 ConfigureNodes(NODES)