summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-04-24 22:16:07 -0400
committerNick Mathewson <nickm@torproject.org>2013-04-24 22:16:07 -0400
commitef83db4fe85f2c73b5891d5b8e53ca776dc230f8 (patch)
tree921ca883fac4b8f39daacbfcdd50aedad79c0cb4 /src/or/config.c
parent68ea7d24d8e1ceb594ae5a63a3d433bd78a079cd (diff)
parentf8bb0064d6a06770e6187ba57a2f4a764336aa84 (diff)
downloadtor-ef83db4fe85f2c73b5891d5b8e53ca776dc230f8.tar.gz
tor-ef83db4fe85f2c73b5891d5b8e53ca776dc230f8.zip
Merge remote-tracking branch 'origin/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 c57feaf270..8ca89b6a77 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5665,7 +5665,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 {