aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-04-24 22:15:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-04-24 22:15:47 -0400
commitf8bb0064d6a06770e6187ba57a2f4a764336aa84 (patch)
tree95c4e9e5bc7a0e8432977d6037e006253335b180 /src/or/config.c
parentcab5f82d125d721fa4b73568323ac1b6009002c3 (diff)
parent07e26005a6cb7e47f1f90fcf6a377dfaaaa56789 (diff)
downloadtor-f8bb0064d6a06770e6187ba57a2f4a764336aa84.tar.gz
tor-f8bb0064d6a06770e6187ba57a2f4a764336aa84.zip
Merge remote-tracking branch 'public/bug6026' into maint-0.2.4
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index e86942cfe1..df1a67ea41 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5577,7 +5577,8 @@ get_first_listener_addrport_string(int listener_type)
to iterate all listener connections and find out in which
port it ended up listening: */
if (cfg->port == CFG_AUTO_PORT) {
- port = router_get_active_listener_port_by_type(listener_type);
+ port = router_get_active_listener_port_by_type_af(listener_type,
+ tor_addr_family(&cfg->addr));
if (!port)
return NULL;
} else {