nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-11-15 11:42:38 -05:00
commit 3ef40f6993
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug4349 Normal file
View File

@ -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.

2
src/or/connection_or.c
View File

@ -1923,7 +1923,7 @@ connection_or_send_netinfo(or_connection_t *conn)
/* Their address. */ /* Their address. */
out = cell.payload + 4; 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) if (len<0)
return -1; return -1;
out += len; out += len;