aboutsummaryrefslogtreecommitdiff
path: root/src/or/channeltls.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-16 09:48:11 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-16 09:48:11 -0500
commit2bcd264a28e2d6bec1e806e779bf82435c9c7505 (patch)
treea134a572dd26adf0bef4cf6f2fad56b21c0032b4 /src/or/channeltls.c
parent3930ffdf63425c344e14c45cff6780108cfa038b (diff)
parentcb92d47deca15c44dd52cad6fc326520648c632e (diff)
downloadtor-2bcd264a28e2d6bec1e806e779bf82435c9c7505.tar.gz
tor-2bcd264a28e2d6bec1e806e779bf82435c9c7505.zip
Merge branch 'maint-0.2.9' into maint-0.3.1
Diffstat (limited to 'src/or/channeltls.c')
-rw-r--r--src/or/channeltls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index c6a0bb21e9..8fb91d412f 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -522,7 +522,7 @@ channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out)
tor_assert(addr_out);
if (tlschan->conn) {
- tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr));
+ tor_addr_copy(addr_out, &(tlschan->conn->real_addr));
rv = 1;
} else tor_addr_make_unspec(addr_out);