diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-24 10:47:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-09-24 10:47:26 -0400 |
| commit | 759de9f756cac3fb4034bfbbb7fd5195c0b24a34 (patch) | |
| tree | 069809d5659c5afb4e5164dff01aae08c63eb6a5 /src/or/channel.c | |
| parent | 31f6806aa7d529ec42f9ddfacdc64bdd644863a7 (diff) | |
| parent | 938ee9b24dfda03a68a71d43b88e9fb00a90f9c8 (diff) | |
| download | tor-759de9f756cac3fb4034bfbbb7fd5195c0b24a34.tar.gz tor-759de9f756cac3fb4034bfbbb7fd5195c0b24a34.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 7f395490c9..afe28bf5e5 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -1295,11 +1295,10 @@ channel_closed(channel_t *chan) if (chan->state == CHANNEL_STATE_CLOSED || chan->state == CHANNEL_STATE_ERROR) return; - if (chan->reason_for_closing == CHANNEL_CLOSE_FOR_ERROR) { - /* Inform any pending (not attached) circs that they should - * give up. */ - circuit_n_chan_done(chan, 0); - } + /* Inform any pending (not attached) circs that they should + * give up. */ + circuit_n_chan_done(chan, 0); + /* Now close all the attached circuits on it. */ circuit_unlink_all_from_channel(chan, END_CIRC_REASON_CHANNEL_CLOSED); |