summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-16 15:16:41 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-16 15:16:41 -0500
commit47aa491f9fbae38f71f96f50c4aec3f871c8419d (patch)
tree761284460160f16366540679826f87f3e07e78c7 /src/or/config.c
parent875a54dad3c4674cc1567d3154e0ccb191dfc0f0 (diff)
parent39850f03f627f4a12daf38ce68018f80feb52d81 (diff)
downloadtor-47aa491f9fbae38f71f96f50c4aec3f871c8419d.tar.gz
tor-47aa491f9fbae38f71f96f50c4aec3f871c8419d.zip
Merge remote-tracking branch 'asn-mytor/bug4751'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 0763058d49..6ecc81db93 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6857,7 +6857,7 @@ get_transport_bindaddr(const char *line, const char *transport)
* should bind on. The string is stored on the heap and must be freed
* by the caller of this function. */
char *
-get_bindaddr_for_transport(const char *transport)
+get_stored_bindaddr_for_server_transport(const char *transport)
{
char *default_addrport = NULL;
const char *stored_bindaddr = NULL;