aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-15 11:42:38 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-15 11:42:38 -0500
commit3ef40f69937abc105877189fbecd78df67dd2d8e (patch)
treee711a3cb7ecdeb9dc4808ca9a3b23cff175c5d4c /src
parent4af82fb3886e8be25ba83a1f93da54bf0d5d7974 (diff)
parent5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed (diff)
downloadtor-3ef40f69937abc105877189fbecd78df67dd2d8e.tar.gz
tor-3ef40f69937abc105877189fbecd78df67dd2d8e.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src')
-rw-r--r--src/or/connection_or.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 202548a6b6..18ee0dfcf8 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1923,7 +1923,7 @@ connection_or_send_netinfo(or_connection_t *conn)
/* Their address. */
out = cell.payload + 4;
- len = append_address_to_payload(out, &conn->_base.addr);
+ len = append_address_to_payload(out, &conn->real_addr);
if (len<0)
return -1;
out += len;