diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-21 14:48:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-21 14:48:53 -0500 |
| commit | 1c05dfd0b6ae9303d1f815a4d610655f32c0cc50 (patch) | |
| tree | 62f8f15a06f49024c46eb4defff27c7286f82495 /src/or/connection.c | |
| parent | 647a90b9b3bcec5d6cac766e6b3756d6ff1302ce (diff) | |
| parent | af1469b9a3298382de39dca87b02410e829399a2 (diff) | |
| download | tor-1c05dfd0b6ae9303d1f815a4d610655f32c0cc50.tar.gz tor-1c05dfd0b6ae9303d1f815a4d610655f32c0cc50.zip | |
Merge branch 'ticket7356_squashed'
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index ce3fda89c1..d6edc4ab91 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -544,8 +544,7 @@ connection_free_(connection_t *conn) or_conn, TLS_CHAN_TO_BASE(or_conn->chan), U64_PRINTF_ARG( TLS_CHAN_TO_BASE(or_conn->chan)->global_identifier)); - if (!(TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_CLOSED || - TLS_CHAN_TO_BASE(or_conn->chan)->state == CHANNEL_STATE_ERROR)) { + if (!CHANNEL_FINISHED(TLS_CHAN_TO_BASE(or_conn->chan))) { channel_close_for_error(TLS_CHAN_TO_BASE(or_conn->chan)); } |