commit 9c49a83ac62f75057eedbc28215d0dc82b037111 Author: teor teor@torproject.org Date: Thu Mar 12 17:17:03 2020 +1000

networks: Use non-exit relays in mixed+hs-v2

Tor 0.3.5 is unstable with exit relays in mixed+hs-v2, so we use non-exit relays.

(Recent tor versions use mixed+hs-v23, and they support exit relays.)

Part of 33379. --- networks/mixed+hs-v2 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index e915e90..e0dfa78 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -2,17 +2,20 @@ OLD_TOR="tor-stable" # By default, Authorities are not configured as exits Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl") OldAuthority = Node(tag="aOLD", authority=1, relay=1, torrc="authority.tmpl", - tor=OLD_TOR) -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) +NonExitRelay = Node(tag="r", relay=1, torrc="relay.tmpl") +OldNonExitRelay = Node(tag="rOLD", relay=1, torrc="relay.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)

+# Due to microdec download issues, tor 0.3.5 needs at least 5 +# authorities/relays/exits in the consensus. +# And for similar reasons, it needs non-exit relays in this network. NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(1) + OldRelay.getN(1) + \ + NonExitRelay.getN(1) + OldNonExitRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ HSv2.getN(1) + OldHSv2.getN(1)