diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-01 10:28:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-11-01 10:28:01 -0400 |
| commit | 12dc55f4878d16bfc3fb6789b31494d47df7ccec (patch) | |
| tree | fc98af22b5c8ec89902f579fba8ffb9e2d3d77fe /src/or/command.c | |
| parent | dde41fa1b00151e01e11341903069f5b2f0db1b7 (diff) | |
| parent | 5de88dda0acda6914bacd1e14c2e037798c5d9d9 (diff) | |
| download | tor-12dc55f4878d16bfc3fb6789b31494d47df7ccec.tar tor-12dc55f4878d16bfc3fb6789b31494d47df7ccec.tar.gz | |
Merge branch 'prop221_squashed_024'
Conflicts:
src/or/or.h
Diffstat (limited to 'src/or/command.c')
| -rw-r--r-- | src/or/command.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/command.c b/src/or/command.c index 5a671183b..9b3ff16f2 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -526,6 +526,7 @@ command_process_destroy_cell(cell_t *cell, channel_t *chan) 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) && cell->circ_id == TO_OR_CIRCUIT(circ)->p_circ_id) { |