commit a2de38a59803558b1c404caf3d3416181e14098f Author: teor teor2345@gmail.com Date: Sun Oct 12 09:18:26 2014 +1100

Increase relays to compensate for smaller guard fraction #2

Increase relays to compensate for smaller guard fraction in mixed, bridges, and bridges+ipv6 flavours. --- networks/bridges | 2 +- networks/bridges+ipv6 | 2 +- networks/mixed | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/networks/bridges b/networks/bridges index ce9116b..86ac93a 100644 --- a/networks/bridges +++ b/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) diff --git a/networks/bridges+ipv6 b/networks/bridges+ipv6 index 00e6029..b5b7e9f 100644 --- a/networks/bridges+ipv6 +++ b/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)

diff --git a/networks/mixed b/networks/mixed index 9dd40c2..5290e81 100644 --- a/networks/mixed +++ b/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)