diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-09-22 15:17:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-09-22 15:17:00 -0400 |
| commit | 6e96eababe8f05ac03b2e83911e6fae5654884b4 (patch) | |
| tree | 7f3c4aefeaaa56ae84cc91b22c64445282fe8f73 /src/or/circuitlist.c | |
| parent | 1edea87c2ac66d9d9ba5c92e6b2e4baddb6bd886 (diff) | |
| parent | e4aaf7666028c30866ad63053ad9f6eb6bf16bf7 (diff) | |
| download | tor-6e96eababe8f05ac03b2e83911e6fae5654884b4.tar.gz tor-6e96eababe8f05ac03b2e83911e6fae5654884b4.zip | |
Merge branch 'bug20203_027_squashed' into maint-0.2.8
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 1efb7ef4d0..d7dbfe5744 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1918,8 +1918,14 @@ marked_circuit_free_cells(circuit_t *circ) return; } cell_queue_clear(&circ->n_chan_cells); - if (! CIRCUIT_IS_ORIGIN(circ)) - cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells); + if (circ->n_mux) + circuitmux_clear_num_cells(circ->n_mux, circ); + if (! CIRCUIT_IS_ORIGIN(circ)) { + or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); + cell_queue_clear(&orcirc->p_chan_cells); + if (orcirc->p_mux) + circuitmux_clear_num_cells(orcirc->p_mux, circ); + } } static size_t |