diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-16 09:31:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-16 09:31:50 -0500 |
| commit | 4b23b398a307e9d1503ebcb1adf0b92a30f145b1 (patch) | |
| tree | 86e161c56a6ce98f31fd3490d438759e9ce4755a /src/or/router.c | |
| parent | d807c7c8725acb85a6695ab399f99c2509a245c4 (diff) | |
| parent | 15dd690605013d8575a335e4d21097e0fbd8140d (diff) | |
| download | tor-4b23b398a307e9d1503ebcb1adf0b92a30f145b1.tar.gz tor-4b23b398a307e9d1503ebcb1adf0b92a30f145b1.zip | |
Merge branch 'bug8546_squashed'
Conflicts:
src/or/connection.c
src/or/or.h
src/or/relay.c
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index a1feda3497..2ddaa895fc 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1848,8 +1848,8 @@ router_rebuild_descriptor(int force) const port_cfg_t *ipv6_orport = NULL; SMARTLIST_FOREACH_BEGIN(get_configured_ports(), const port_cfg_t *, p) { if (p->type == CONN_TYPE_OR_LISTENER && - ! p->no_advertise && - ! p->bind_ipv4_only && + ! p->server_cfg.no_advertise && + ! p->server_cfg.bind_ipv4_only && tor_addr_family(&p->addr) == AF_INET6) { if (! tor_addr_is_internal(&p->addr, 0)) { ipv6_orport = p; |