diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-02-12 12:57:18 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-02-12 12:57:18 -0500 |
| commit | c1b5e7fa1bfb7a64c148f098c86b08f4f3167213 (patch) | |
| tree | 4d365c43ed8132ade4cf9f5e9709d62e735f35ea /src/feature/relay | |
| parent | e6caf7d8c76660dbbaf68ee56c7ebf31a2ac9605 (diff) | |
| parent | bdca475518ca3036f1df7e78fef93bfa988cb01f (diff) | |
| download | tor-c1b5e7fa1bfb7a64c148f098c86b08f4f3167213.tar.gz tor-c1b5e7fa1bfb7a64c148f098c86b08f4f3167213.zip | |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/feature/relay')
| -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 e7ecce665e..cd3790856b 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2124,8 +2124,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); |