[tor-commits] [chutney/master] Try the same multi-phase fix on two more bridges networks

[nickm@xxxxxxxxxxxxxx]

commit e055b6478a7f7187a87e256fe57e093fb61c3355
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Jul 20 14:03:13 2020 -0400

    Try the same multi-phase fix on two more bridges networks
---
 networks/bridges+ipv6-min | 6 ++++--
 networks/bridges-min      | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/networks/bridges+ipv6-min b/networks/bridges+ipv6-min
index cdf6dc7..a305b89 100644
--- a/networks/bridges+ipv6-min
+++ b/networks/bridges+ipv6-min
@@ -6,8 +6,10 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
                        relay=1, torrc="bridgeauthority.tmpl")
 BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]",
-                  torrc="bridge-v6.tmpl")
-BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
+                  torrc="bridge-v6.tmpl", launch_phase=2)
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1,
+                    torrc="bridgeclient.tmpl",
+                    launch_phase=3)
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks
diff --git a/networks/bridges-min b/networks/bridges-min
index f8ec732..1904392 100644
--- a/networks/bridges-min
+++ b/networks/bridges-min
@@ -4,8 +4,13 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 
 BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
                        relay=1, torrc="bridgeauthority.tmpl")
-Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl")
-BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
+
+Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl",
+              launch_phase=2)
+
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1,
+                    torrc="bridgeclient.tmpl",
+                    launch_phase=3)
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits