Merge remote-tracking branch 'public/bug12195'

diff --cc src/or/command.c
index 9b3ff16f2ca94512a80feafa180e357044158b07,f638fad41cde1cd414528044d9eaf03e6f34758c..105bdc637e0dafeca758f80e8472f6da004ff213
--- 1/src/or/command.c
--- 2/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);