diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-15 15:19:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-15 15:19:38 -0400 |
| commit | 4dde69a6d003682217c2bf6327b5923c7b811974 (patch) | |
| tree | d0debee04bbc6ba0f66d68e5e4c8c1df8a269ce7 | |
| parent | c42bd529dea474db1a1af4432b9fe5552c0ca07e (diff) | |
| parent | ab418447eb9838a8a6f5588e374910d753740d0f (diff) | |
| download | tor-4dde69a6d003682217c2bf6327b5923c7b811974.tar tor-4dde69a6d003682217c2bf6327b5923c7b811974.tar.gz | |
Merge remote branch 'origin/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 000000000..f947afaeb --- /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 874e724b7..42f81d107 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1221,7 +1221,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; } |