From 822cb93cab59e9735e2efda70bc88c47cc92c498 Mon Sep 17 00:00:00 2001
From: Neel Chauhan <neel@neelc.org>
Date: Wed, 26 Sep 2018 19:14:33 -0400
Subject: Add new option ClientAutoIPv6ORPort to switch between IPv4 and IPv6
 OR ports

---
 src/feature/client/bridges.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/feature/client/bridges.c')

diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c
index e8afb5a924..e3ed288415 100644
--- a/src/feature/client/bridges.c
+++ b/src/feature/client/bridges.c
@@ -844,7 +844,8 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node)
       }
     }
 
-    if (options->ClientPreferIPv6ORPort == -1) {
+    if (options->ClientPreferIPv6ORPort == -1 ||
+        options->ClientAutoIPv6ORPort == 0) {
       /* Mark which address to use based on which bridge_t we got. */
       node->ipv6_preferred = (tor_addr_family(&bridge->addr) == AF_INET6 &&
                               !tor_addr_is_null(&node->ri->ipv6_addr));
-- 
cgit v1.2.3-54-g00ecf