diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-15 11:42:38 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-15 11:42:38 -0500 |
| commit | 3ef40f69937abc105877189fbecd78df67dd2d8e (patch) | |
| tree | e711a3cb7ecdeb9dc4808ca9a3b23cff175c5d4c | |
| parent | 4af82fb3886e8be25ba83a1f93da54bf0d5d7974 (diff) | |
| parent | 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed (diff) | |
| download | tor-3ef40f69937abc105877189fbecd78df67dd2d8e.tar.gz tor-3ef40f69937abc105877189fbecd78df67dd2d8e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug4349 | 4 | ||||
| -rw-r--r-- | src/or/connection_or.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug4349 b/changes/bug4349 new file mode 100644 index 0000000000..633916bdfd --- /dev/null +++ b/changes/bug4349 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When sending a NETINFO cell, include the original address + received for the other side, not its canonical address. Found + by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. 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; |