Merge remote-tracking branch 'teor/issue-13161-template-tweaks'

networks/bridges

@@ -7,7 +7,7 @@ BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
 Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl")
 BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl")
 
-NODES = Authority.getN(3) + BridgeAuthority.getN(1) + Relay.getN(5) + \
+NODES = Authority.getN(3) + BridgeAuthority.getN(1) + Relay.getN(8) + \
     Bridge.getN(2) + Client.getN(2) + BridgeClient.getN(1)
 
 ConfigureNodes(NODES)

networks/bridges+ipv6

@@ -8,7 +8,7 @@ Bridge = Node(tag="br", bridge=1, relay=1, torrc="bridge.tmpl")
 BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl")
 BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl")
 
-NODES = Authority.getN(3) + BridgeAuthority.getN(1) + Relay.getN(5) + \
+NODES = Authority.getN(3) + BridgeAuthority.getN(1) + Relay.getN(8) + \
     Bridge.getN(1) + BridgeIPv6.getN(1) + \
     Client.getN(2) + BridgeClient.getN(1)
 

networks/mixed

@@ -8,7 +8,7 @@ OldRelay = Node(tag="rOLD", relay=1, torrc="relay.tmpl", tor=OLD_TOR)
 Client = Node(tag="c", torrc="client.tmpl")
 OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR)
 
-NODES = (Authority.getN(2) + OldAuthority.getN(2) + OldRelay.getN(3) +
-      Relay.getN(3) + Client.getN(2) + OldClient.getN(2))
+NODES = (Authority.getN(2) + OldAuthority.getN(2) + OldRelay.getN(4) +
+      Relay.getN(4) + Client.getN(2) + OldClient.getN(2))
 
 ConfigureNodes(NODES)