commit fee8719ddda7a41e1e23427c80c9f6be3a86e15f Author: teor teor2345@gmail.com Date: Wed Sep 13 09:05:32 2017 +1000
Add a bridges+hs-v23 network
This would be a great default network for chutney, but it requires tor 0.3.2 or later.
Part of 22437. --- networks/bridges+hs-v23 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/networks/bridges+hs-v23 b/networks/bridges+hs-v23 new file mode 100644 index 0000000..5a5a367 --- /dev/null +++ b/networks/bridges+hs-v23 @@ -0,0 +1,22 @@ +# 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") + +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") +HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") +HSv3 = 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 5 authorities/relays/exits to ensure we can build HS connections +NODES = Authority.getN(3) + BridgeAuthority.getN(1) + \ + ExitRelay.getN(4) + \ + Bridge.getN(1) + \ + Client.getN(1) + BridgeClient.getN(1) + \ + HS.getN(1) + +ConfigureNodes(NODES)
tor-commits@lists.torproject.org