commit 8b93cbc16d2ec0b64ce9d48482a2cf2164ed1199 Merge: 70d3985 3b6da3f Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 12:00:46 2016 -0500

Merge branch 'bug20716_026' into maint-0.2.9

changes/bug20716 | 3 +++ src/or/connection.c | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

diff --cc src/or/connection.c index 49cb78e,3fe7f45..d30ec46 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -1594,8 -1497,13 +1594,13 @@@ connection_handle_listener_read(connect

/* remember the remote address */ tor_addr_copy(&newconn->addr, &addr); - newconn->port = port; - newconn->address = tor_addr_to_str_dup(&addr); + if (new_type == CONN_TYPE_AP && conn->socket_family == AF_UNIX) { + newconn->port = 0; + newconn->address = tor_strdup(conn->address); + } else { + newconn->port = port; - newconn->address = tor_dup_addr(&addr); ++ newconn->address = tor_addr_to_str_dup(&addr); + }

if (new_type == CONN_TYPE_AP && conn->socket_family != AF_UNIX) { log_info(LD_NET, "New SOCKS connection opened from %s.",