diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-03-09 09:33:05 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-03-09 09:33:05 -0400 |
| commit | 6684c6e17fd6e038159dd2ca63416cdcd7a12270 (patch) | |
| tree | 618b9da6336fe47dcaf21591e6b49bdd1051ba4b /src/feature/client | |
| parent | 8096f3b2549971e120fa3869ea9e458fdad313d5 (diff) | |
| parent | 7d673e70b072663e3f9f11819b166846e578251d (diff) | |
| download | tor-6684c6e17fd6e038159dd2ca63416cdcd7a12270.tar.gz tor-6684c6e17fd6e038159dd2ca63416cdcd7a12270.zip | |
Merge branch 'tor-github/pr/1751'
Diffstat (limited to 'src/feature/client')
| -rw-r--r-- | src/feature/client/bridges.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index 2b52a1173d..66b04f3bc2 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -844,8 +844,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) } } - if (options->ClientPreferIPv6ORPort == -1 || - options->ClientAutoIPv6ORPort == 0) { + if (options->ClientPreferIPv6ORPort == -1) { /* 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)); |