diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-15 15:18:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-15 15:18:15 -0400 |
| commit | ab418447eb9838a8a6f5588e374910d753740d0f (patch) | |
| tree | 14479dbdb2ad4d348972a87b7e3ab120b80a61bd | |
| parent | 5938804d17f6b458fcec9d479cd734d2e0256631 (diff) | |
| parent | 06f026de6624ea0591b8d08da9c5c69ffa44568c (diff) | |
| download | tor-ab418447eb9838a8a6f5588e374910d753740d0f.tar.gz tor-ab418447eb9838a8a6f5588e374910d753740d0f.zip | |
Merge branch 'bug2757' into maint-0.2.2
| -rw-r--r-- | changes/bug2757 | 6 | ||||
| -rw-r--r-- | src/or/connection.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug2757 b/changes/bug2757 new file mode 100644 index 0000000000..f947afaeb4 --- /dev/null +++ b/changes/bug2757 @@ -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). diff --git a/src/or/connection.c b/src/or/connection.c index fd30ac8cb6..1894bc71ca 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1178,7 +1178,7 @@ connection_handle_listener_read(connection_t *conn, int new_type) } if (connection_init_accepted_conn(newconn, conn->type) < 0) { - if (! conn->marked_for_close) + if (! newconn->marked_for_close) connection_mark_for_close(newconn); return 0; } |