[tor-commits] [chutney/master] Add missing ipv6_addr to ipv6-exit-min

[nickm at torproject.org]

commit 0fd9d90d9a6a14f5b75208c85a71dd5997dcf35b
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 21 16:11:43 2020 -0400

    Add missing ipv6_addr to ipv6-exit-min
    
    Without these, "None" is put in the ORPort for IPv6.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 networks/ipv6-exit-min | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/networks/ipv6-exit-min b/networks/ipv6-exit-min
index 2771298..ceba48a 100644
--- a/networks/ipv6-exit-min
+++ b/networks/ipv6-exit-min
@@ -1,7 +1,9 @@
 Require("IPV6")
 # By default, Authorities are not configured as exits
-Authority = Node(tag="a", authority=1, relay=1, torrc="authority.tmpl")
-IPv6ExitRelay = Node(tag="r", relay=1, exit=1, torrc="relay-exit-v6-only.tmpl")
+Authority = Node(tag="a", authority=1, relay=1, ipv6_addr="[::1]",
+                 torrc="authority-orport-v6.tmpl")
+IPv6ExitRelay = Node(tag="r", relay=1, exit=1, ipv6_addr="[::1]",
+                     torrc="relay-exit-v6-only.tmpl")
 Client = Node(tag="c", client=1, torrc="client.tmpl")
 
 # Since only 25% of relays get the guard flag,