tor

commit bdca475518ca3036f1df7e78fef93bfa988cb01f
parent 73bedcaf4db3688c5720fb078e584d5b2a73f052
Author: David Goulet <dgoulet@torproject.org>
Date:   Fri, 12 Feb 2021 12:56:15 -0500

Merge branch 'tor-gitlab/mr/302' into maint-0.4.5

Diffstat:
M
src/feature/relay/router.c
 | 
3
+--

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git 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);