Browse Source

Tag every client and bridge client in every networks file

Using the following mass replace scripts:

sed -i~ 's/tag="c",/tag="c", client=1,/'
sed -i~ 's/tag="cOLD",/tag="cOLD", client=1,/'
sed -i~ 's/tag="bc",/tag="bc", client=1, bridgeclient=1,/'
sed -i~ 's/tag="bcOLD",/tag="bcOLD", client=1, bridgeclient=1,/'

Part of 22224, but currently unused.
teor 5 years ago
parent
commit
d1535113b2

+ 1 - 1
networks/basic

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
 # in 0.2.6

+ 1 - 1
networks/basic-025

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 NODES = Authority.getN(4) + ExitRelay.getN(16) + Client.getN(5)
 

+ 1 - 1
networks/basic-100

@@ -3,7 +3,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 NODES = Authority.getN(5) + ExitRelay.getN(35) + Client.getN(60)
 

+ 1 - 1
networks/basic-min

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks

+ 2 - 2
networks/basic-min-mixed

@@ -17,8 +17,8 @@ ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 OldExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl",
                     tor=OLD_TOR)
 
-Client = Node(tag="c", torrc="client.tmpl")
-OldClient = Node(tag="c", torrc="client.tmpl", tor=OLD_TOR)
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR)
 
 # Choose old or new Exit and Client at random
 OldNewExitRelay = rng.choice([OldExitRelay, ExitRelay])

+ 2 - 2
networks/bridges

@@ -1,12 +1,12 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.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", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
 # in 0.2.6

+ 2 - 2
networks/bridges+hs

@@ -1,12 +1,12 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.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", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag

+ 2 - 2
networks/bridges+hs-v23

@@ -1,12 +1,12 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.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", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
 HSv3 = Node(tag="h", hs=1, torrc="hs-.tmpl")
 

+ 2 - 2
networks/bridges+ipv6

@@ -1,13 +1,13 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.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")
 BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl")
-BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
 # in 0.2.6

+ 2 - 2
networks/bridges+ipv6+hs

@@ -1,13 +1,13 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.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")
 BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl")
-BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag

+ 2 - 2
networks/bridges+ipv6+hs-v23

@@ -1,13 +1,13 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.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")
 BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-v6.tmpl")
-BridgeClient = Node(tag="bc", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
 HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 

+ 1 - 1
networks/bridges+ipv6-min

@@ -6,7 +6,7 @@ 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", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks

+ 1 - 1
networks/bridges-min

@@ -5,7 +5,7 @@ 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", torrc="bridgeclient.tmpl")
+BridgeClient = Node(tag="bc", client=1, bridgeclient=1, torrc="bridgeclient.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks

+ 1 - 1
networks/client-ipv6-only

@@ -9,7 +9,7 @@ ExitRelay6 = Node(tag="r", relay=1, exit=1,
                                            '[::1]'),
                   torrc="relay-orport-v6-exit.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks

+ 1 - 1
networks/hs

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag

+ 1 - 1
networks/hs-025

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 NODES = Authority.getN(4) + NonExitRelay.getN(10) + \

+ 1 - 1
networks/hs-100

@@ -3,7 +3,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 NODES = Authority.getN(5) + NonExitRelay.getN(25) + \

+ 1 - 1
networks/hs-100-clients

@@ -3,7 +3,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # Well, 100 instances, with lots of clients

+ 1 - 1
networks/hs-client-ipv6

@@ -8,7 +8,7 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/hs-exit-min

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag

+ 1 - 1
networks/hs-intro

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS0 = Node(tag="h", hs=1, torrc="hs0.tmpl")
 HS1 = Node(tag="h", hs=1, torrc="hs1.tmpl")
 HS2 = Node(tag="h", hs=1, torrc="hs2.tmpl")

+ 2 - 2
networks/hs-ipv6

@@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 HS6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/hs-min

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 2 - 2
networks/hs-min-mixed

@@ -17,8 +17,8 @@ NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
 OldNonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl",
                        tor=OLD_TOR)
 
-Client = Node(tag="c", torrc="client.tmpl")
-OldClient = Node(tag="c", torrc="client.tmpl", tor=OLD_TOR)
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+OldClient = Node(tag="c", client=1, torrc="client.tmpl", tor=OLD_TOR)
 
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 OldHS = Node(tag="h", hs=1, torrc="hs.tmpl", tor=OLD_TOR)

+ 1 - 1
networks/hs-v2-min

@@ -3,7 +3,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 2 - 2
networks/hs-v23-ipv6

@@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 HSv2IPv6 = Node(tag="h", hs=1, torrc="hs-only-v6.tmpl")
 HSv3IPv6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl")
 

+ 1 - 1
networks/hs-v23-min

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
 HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 

+ 1 - 1
networks/hs-v3

@@ -3,7 +3,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag

+ 1 - 1
networks/hs-v3-intro

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS10 = Node(tag="h", hs=1, torrc="hs-v3-10.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 2 - 2
networks/hs-v3-ipv6

@@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 HS6 = Node(tag="h", hs=1, torrc="hs3-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/hs-v3-min

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 HS = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/ipv6-exit-min

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 IPv6ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay-exit-v6-only.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 # Since only 25% of relays get the guard flag,
 # TestingDirAuthVoteGuard * may need to be used in small networks

+ 1 - 1
networks/middle

@@ -2,7 +2,7 @@
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
 # in 0.2.6

+ 1 - 1
networks/middle-025

@@ -2,7 +2,7 @@
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 NODES = Authority.getN(4) + \
       NonExitRelay.getN(10) + ExitRelay.getN(6) + \

+ 1 - 1
networks/middle-100

@@ -4,7 +4,7 @@
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="m", relay=1, torrc="relay-non-exit.tmpl")
 ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 NODES = Authority.getN(5) + \
       NonExitRelay.getN(25) + ExitRelay.getN(10) + \

+ 2 - 2
networks/mixed

@@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl",
 Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl",
                     tor=OLD_TOR)
-Client = Node(tag="c", torrc="client.tmpl")
-OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR)
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR)
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
 # in 0.2.6

+ 2 - 2
networks/mixed+hs-v2

@@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl",
 Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl",
                     tor=OLD_TOR)
-Client = Node(tag="c", torrc="client.tmpl")
-OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR)
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR)
 HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
 OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR)
 

+ 2 - 2
networks/mixed+hs-v23

@@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl",
 Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl",
                     tor=OLD_TOR)
-Client = Node(tag="c", torrc="client.tmpl")
-OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR)
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR)
 HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl")
 OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR)
 # Old tor versions don't have HSv3 support yet

+ 2 - 2
networks/mixed+hs-v3

@@ -6,8 +6,8 @@ OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl",
 Relay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
 OldRelay = Node(tag="rOLD", relay=1, exit=1, torrc="relay.tmpl",
                     tor=OLD_TOR)
-Client = Node(tag="c", torrc="client.tmpl")
-OldClient = Node(tag="cOLD", torrc="client.tmpl", tor=OLD_TOR)
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR)
 # Old tor versions don't have HSv3 support yet
 HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
 

+ 1 - 1
networks/single-onion

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/single-onion-client-ipv6

@@ -8,7 +8,7 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 SingleOnion = Node(tag="h", hs=1, torrc="single-onion.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/single-onion-indirect

@@ -7,7 +7,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 SingleOnionIndirect = Node(tag="h", hs=1, torrc="single-onion-indirect.tmpl")
 
 # A hidden service needs 5 authorities/relays to ensure it can build HS

+ 2 - 2
networks/single-onion-ipv6

@@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 SingleOnion6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 1 - 1
networks/single-onion-v23

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 SingleOnionv2 = Node(tag="h", hs=1, torrc="single-onion.tmpl")
 SingleOnionv3 = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl")
 

+ 2 - 2
networks/single-onion-v23-ipv6

@@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 SingleOnionv2IPv6 = Node(tag="h", hs=1, torrc="single-onion-only-v6.tmpl")
 SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl")
 

+ 1 - 1
networks/single-onion-v3

@@ -1,7 +1,7 @@
 # By default, Authorities are not configured as exits
 Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
 NonExitRelay = Node(tag="r", relay=1, torrc="relay-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
 SingleOnion = Node(tag="h", hs=1, torrc="single-onion-v3.tmpl")
 
 # Since only 25% of relays get the guard flag,

+ 2 - 2
networks/single-onion-v3-ipv6

@@ -8,8 +8,8 @@ NonExitRelay6 = Node(tag="r", relay=1,
                      ipv6_addr=os.environ.get('CHUTNEY_LISTEN_ADDRESS_V6',
                                               '[::1]'),
                      torrc="relay-orport-v6-non-exit.tmpl")
-Client = Node(tag="c", torrc="client.tmpl")
-Client6 = Node(tag="c", torrc="client-only-v6.tmpl")
+Client = Node(tag="c", client=1, torrc="client.tmpl")
+Client6 = Node(tag="c", client=1, torrc="client-only-v6.tmpl")
 SingleOnionv3IPv6 = Node(tag="h", hs=1, torrc="single-onion-v3-only-v6.tmpl")
 
 # Since only 25% of relays get the guard flag,