commit 87d0fe04d5ff8bc29f20b093eb084ce8753be98f Author: teor teor@torproject.org Date: Fri Feb 14 13:48:55 2020 +1000

networks/mixed: Update for HSv3

Update mixed networks, now that all supported tor versions can run v3 Onion Services.

Also make the networks slightly smaller: they only need 6 relays, not 8. (The minimum is 5.)

Preparation for 33232. --- networks/mixed | 2 +- networks/mixed+hs-v2 | 2 +- networks/mixed+hs-v23 | 12 +++++------- networks/mixed+hs-v3 | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/networks/mixed b/networks/mixed index a0c126e..488d91d 100644 --- a/networks/mixed +++ b/networks/mixed @@ -10,7 +10,7 @@ Client = Node(tag="c", client=1, torrc="client.tmpl") OldClient = Node(tag="cOLD", client=1, torrc="client.tmpl", tor=OLD_TOR)

NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(2) + OldClient.getN(2)

ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v2 b/networks/mixed+hs-v2 index 5d901ed..e915e90 100644 --- a/networks/mixed+hs-v2 +++ b/networks/mixed+hs-v2 @@ -12,7 +12,7 @@ HSv2 = Node(tag="h", hs=1, torrc="hs.tmpl") OldHSv2 = Node(tag="hOLD", hs=1, torrc="hs.tmpl", tor=OLD_TOR)

NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ HSv2.getN(1) + OldHSv2.getN(1)

diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23 index fd180bf..992e99a 100644 --- a/networks/mixed+hs-v23 +++ b/networks/mixed+hs-v23 @@ -10,15 +10,13 @@ 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) -# Old tor versions don't have HSv3 support yet -# And chutney doesn't know how to tell old clients to avoid v3 services -# See 23498 -#HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR)

NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ - HSv2.getN(1) + OldHSv2.getN(1) -# HSv3.getN(1) + HSv2.getN(1) + OldHSv2.getN(1) + \ + HSv3.getN(1) + OldHSv3.getN(1)

ConfigureNodes(NODES) diff --git a/networks/mixed+hs-v3 b/networks/mixed+hs-v3 index e2e9aa5..b1dcce7 100644 --- a/networks/mixed+hs-v3 +++ b/networks/mixed+hs-v3 @@ -8,12 +8,12 @@ OldRelay = Node(tag="rOLD", relay=1, exit=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) -# Old tor versions don't have HSv3 support yet HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl") +OldHSv3 = Node(tag="hOLD", hs=1, torrc="hs-v3.tmpl", tor=OLD_TOR)

NODES = Authority.getN(2) + OldAuthority.getN(2) + \ - Relay.getN(2) + OldRelay.getN(2) + \ + Relay.getN(1) + OldRelay.getN(1) + \ Client.getN(1) + OldClient.getN(1) + \ - HSv3.getN(1) + HSv3.getN(1) + OldHSv3.getN(1)

ConfigureNodes(NODES)