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

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-03-15 15:19:38 -04:00
commit 4dde69a6d0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug2757 Normal file
View File

@ -0,0 +1,6 @@
- Minor bugfixes
o Avoid a double-mark-for-free warning when failing to attach a
transparent proxy connection. (We thought we had fixed this in
0.2.2.23-alpha, but it turns out our fix was checking the wrong
connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original
bug) and 0.2.2.23-alpha (the incorrect fix).

2
src/or/connection.c
View File

@ -1221,7 +1221,7 @@ connection_handle_listener_read(connection_t *conn, int new_type)
} }
if (connection_init_accepted_conn(newconn, conn->type) < 0) { if (connection_init_accepted_conn(newconn, conn->type) < 0) {
if (! conn->marked_for_close) if (! newconn->marked_for_close)
connection_mark_for_close(newconn); connection_mark_for_close(newconn);
return 0; return 0;
} }