diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-21 14:48:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-21 14:48:53 -0500 |
| commit | 1c05dfd0b6ae9303d1f815a4d610655f32c0cc50 (patch) | |
| tree | 62f8f15a06f49024c46eb4defff27c7286f82495 /src/or/circuitbuild.c | |
| parent | 647a90b9b3bcec5d6cac766e6b3756d6ff1302ce (diff) | |
| parent | af1469b9a3298382de39dca87b02410e829399a2 (diff) | |
| download | tor-1c05dfd0b6ae9303d1f815a4d610655f32c0cc50.tar.gz tor-1c05dfd0b6ae9303d1f815a4d610655f32c0cc50.zip | |
Merge branch 'ticket7356_squashed'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index ddb186bea4..faddc08e03 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -672,7 +672,7 @@ circuit_deliver_create_cell(circuit_t *circ, const create_cell_t *create_cell, if (CIRCUIT_IS_ORIGIN(circ)) { /* Update began timestamp for circuits starting their first hop */ if (TO_ORIGIN_CIRCUIT(circ)->cpath->state == CPATH_STATE_CLOSED) { - if (circ->n_chan->state != CHANNEL_STATE_OPEN) { + if (!CHANNEL_IS_OPEN(circ->n_chan)) { log_warn(LD_CIRC, "Got first hop for a circuit without an opened channel. " "State: %s.", channel_state_to_string(circ->n_chan->state)); |