commit 396da926fd49b632577beaa571f13ec3a1a13310 Author: teor (Tim Wilson-Brown) teor2345@gmail.com Date: Wed Sep 2 00:34:42 2015 +1000

Add bridges+hs network to test bridges and hidden services together

This network allows non-IPv6 systems to test almost all tor functionality. --- networks/bridges+hs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)

diff --git a/networks/bridges+hs b/networks/bridges+hs new file mode 100644 index 0000000..8cf0ec6 --- /dev/null +++ b/networks/bridges+hs @@ -0,0 +1,21 @@ +# 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") +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 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)