mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-21 13:34:59 +02:00
Merge branch 'tor-gitlab/mr/302' into maint-0.4.5
This commit is contained in:
commit
bdca475518
@ -2101,8 +2101,7 @@ router_build_fresh_unsigned_routerinfo,(routerinfo_t **ri_out))
|
|||||||
ri->ipv4_dirport = routerconf_find_dir_port(options, 0);
|
ri->ipv4_dirport = routerconf_find_dir_port(options, 0);
|
||||||
|
|
||||||
/* Optionally check for an IPv6. We still publish without one. */
|
/* Optionally check for an IPv6. We still publish without one. */
|
||||||
if (!omit_ipv6_on_publish &&
|
if (relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG,
|
||||||
relay_find_addr_to_publish(options, AF_INET6, RELAY_FIND_ADDR_NO_FLAG,
|
|
||||||
&ri->ipv6_addr)) {
|
&ri->ipv6_addr)) {
|
||||||
ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6);
|
ri->ipv6_orport = routerconf_find_or_port(options, AF_INET6);
|
||||||
router_check_descriptor_address_consistency(&ri->ipv6_addr);
|
router_check_descriptor_address_consistency(&ri->ipv6_addr);
|
||||||
|
Loading…
Reference in New Issue
Block a user