commit e74c3601567ab0ca14c5e2a7b9b40b416a47001e Merge: ea44287 84ed086 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 4 12:16:03 2014 -0400

Merge remote-tracking branch 'public/bug12195'

changes/bug12195 | 7 +++++++ src/or/command.c | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-)

diff --cc src/or/command.c index 9b3ff16,f638fad..105bdc6 --- a/src/or/command.c +++ b/src/or/command.c @@@ -526,9 -500,9 +527,10 @@@ command_process_destroy_cell(cell_t *ce log_debug(LD_OR,"Received for circID %u.",(unsigned)cell->circ_id);

reason = (uint8_t)cell->payload[0]; + circ->received_destroy = 1;

if (!CIRCUIT_IS_ORIGIN(circ) && + chan == TO_OR_CIRCUIT(circ)->p_chan && cell->circ_id == TO_OR_CIRCUIT(circ)->p_circ_id) { /* the destroy came from behind */ circuit_set_p_circid_chan(TO_OR_CIRCUIT(circ), 0, NULL);