diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-10-23 12:55:10 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-10-23 12:55:10 -0400 |
| commit | 0c2a3601e8283f3a63f624cfe2c54d21cae62fa3 (patch) | |
| tree | d5e1c3fe8586dcefb973bc3f04b927857cef1a6f | |
| parent | cc3f0ba1e8b49f0dc2a40c80d741808380e0ab45 (diff) | |
| parent | b095be7f69e4b010d990d08c14eea74729f9528c (diff) | |
| download | tor-0c2a3601e8283f3a63f624cfe2c54d21cae62fa3.tar tor-0c2a3601e8283f3a63f624cfe2c54d21cae62fa3.tar.gz | |
Merge remote-tracking branch 'rransom-tor/bug3825c'
| -rw-r--r-- | src/or/circuitlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index e4408f84c..25b80f11f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1201,7 +1201,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, } if (circ->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); - int timed_out = (reason == END_STREAM_REASON_TIMEOUT); + int timed_out = (reason == END_CIRC_REASON_TIMEOUT); tor_assert(circ->state == CIRCUIT_STATE_OPEN); tor_assert(ocirc->build_state->chosen_exit); tor_assert(ocirc->rend_data); @@ -1216,7 +1216,7 @@ _circuit_mark_for_close(circuit_t *circ, int reason, int line, INTRO_POINT_FAILURE_TIMEOUT : INTRO_POINT_FAILURE_GENERIC); } else if (circ->purpose == CIRCUIT_PURPOSE_C_INTRODUCING && - reason != END_STREAM_REASON_TIMEOUT) { + reason != END_CIRC_REASON_TIMEOUT) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); tor_assert(ocirc->build_state->chosen_exit); tor_assert(ocirc->rend_data); |