|
@@ -1,5 +1,6 @@
|
|
|
+# By default, Authorities are not configured as exits
|
|
|
Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
|
|
|
-Relay = Node(tag="r", relay=1, torrc="relay.tmpl")
|
|
|
+ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay.tmpl")
|
|
|
Client = Node(tag="c", torrc="client.tmpl")
|
|
|
|
|
|
BridgeAuthority = Node(tag="ba", authority=1, bridgeauthority=1,
|
|
@@ -9,13 +10,14 @@ BridgeIPv6 = Node(tag="br", bridge=1, relay=1, ipv6_addr="[::1]", torrc="bridge-
|
|
|
BridgeClient = Node(tag="bc", 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 in 0.2.6
|
|
|
-# We need 6 (or 7?) authorities/relays/exits to ensure we can build HS connections
|
|
|
+# We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
|
|
|
+# in 0.2.6
|
|
|
+# We need 5 authorities/relays/exits to ensure we can build HS connections
|
|
|
# We put the IPv6 bridge first to ensure that clients try IPv6 before IPv4
|
|
|
# Unfortunately, this does not prevent clients falling back to IPv4
|
|
|
-# TODO: create test for IPv6 only
|
|
|
+# bridges+ipv6-min only has IPv6 bridges
|
|
|
NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \
|
|
|
- Relay.getN(4) + \
|
|
|
+ ExitRelay.getN(4) + \
|
|
|
BridgeIPv6.getN(1) + Bridge.getN(1) + \
|
|
|
Client.getN(1) + BridgeClient.getN(1) + \
|
|
|
HS.getN(1)
|