[tor-commits] [chutney/master] Disable v3 onion services in mixed networks

[teor at torproject.org]

commit 99b7c5e8e8e063af8a166fea65ce77f02a483e39
Author: teor <teor2345 at gmail.com>
Date:   Wed Sep 13 14:44:42 2017 +1000

    Disable v3 onion services in mixed networks
    
    This is a workaround until 23498 is implemented.
---
 networks/mixed+hs-v23 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/networks/mixed+hs-v23 b/networks/mixed+hs-v23
index f959032..eab43e9 100644
--- a/networks/mixed+hs-v23
+++ b/networks/mixed+hs-v23
@@ -11,14 +11,16 @@ 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
-HSv3 = Node(tag="h", hs=1, torrc="hs-v3.tmpl")
+# 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")
 
 # We need 8 authorities/relays/exits to ensure at least 2 get the guard flag
 # in 0.2.6
 NODES = Authority.getN(2) + OldAuthority.getN(2) + \
         Relay.getN(2) + OldRelay.getN(2) + \
         Client.getN(1) + OldClient.getN(1) + \
-        HSv2.getN(1) + OldHSv2.getN(1) + \
-        HSv3.getN(1)
+        HSv2.getN(1) + OldHSv2.getN(1)
+#        HSv3.getN(1)
 
 ConfigureNodes(NODES)