diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-02-12 12:56:15 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-02-12 12:56:15 -0500 |
| commit | bdca475518ca3036f1df7e78fef93bfa988cb01f (patch) | |
| tree | a2f19958fad464e2eae18b0ca6b21658a20f9f5b | |
| parent | 73bedcaf4db3688c5720fb078e584d5b2a73f052 (diff) | |
| parent | 5138a9c3c22fb00b3f6e04058d80f0e6d56aea91 (diff) | |
| download | tor-bdca475518ca3036f1df7e78fef93bfa988cb01f.tar.gz tor-bdca475518ca3036f1df7e78fef93bfa988cb01f.zip | |
Merge branch 'tor-gitlab/mr/302' into maint-0.4.5
| -rw-r--r-- | src/feature/relay/router.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 8a7e76e33f..2696b8633b 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2101,8 +2101,7 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out)) ri->ipv4_dirport = routerconf_find_dir_port(options, 0); /* Optionally check for an IPv6. We still publish without one. */ - if (!omit_ipv6_on_publish && - relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, + if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG, &ri->ipv6_addr)) { ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6); router_check_descriptor_address_consistency(&ri->ipv6_addr); |