diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-04 21:47:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-04 21:47:45 -0500 |
| commit | bd93ff8dd76b06ca3afe1f362b086d4f12639f71 (patch) | |
| tree | b297d9a8f951afffdeb2bbabf7f997ca8b4fda72 | |
| parent | e899d49e2fa726a4f65120c9457b8d13d51f3944 (diff) | |
| parent | c01dfd5d7b5662c9bc70ae9a97ecd268b307495c (diff) | |
| download | tor-bd93ff8dd76b06ca3afe1f362b086d4f12639f71.tar.gz tor-bd93ff8dd76b06ca3afe1f362b086d4f12639f71.zip | |
Merge remote-tracking branch 'asn/bug7592_take2'
| -rw-r--r-- | src/or/connection_edge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 0220930c4a..67e382bdb6 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2614,6 +2614,7 @@ connection_exit_connect(edge_connection_t *edge_conn) connection_edge_end(edge_conn, END_STREAM_REASON_INTERNAL); circuit_detach_stream(circuit_get_by_edge_conn(edge_conn), edge_conn); connection_free(conn); + return; } connection_edge_send_command(edge_conn, |