From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Jun 2014 16:16:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug12195'
X-Git-Tag: tor-0.2.5.5-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e74c3601567ab0ca14c5e2a7b9b40b416a47001e;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug12195'
---

e74c3601567ab0ca14c5e2a7b9b40b416a47001e
diff --cc src/or/command.c
index 9b3ff16f2c,f638fad41c..105bdc637e
--- 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);