diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-04-27 15:21:27 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-04-27 15:21:27 -0400 |
| commit | d4a61c76a1f4e21671cb93c1d5df1e31f9adc117 (patch) | |
| tree | 23668bb2754534903f037ea29d1f80328a1ac879 /src/or | |
| parent | 78c610eea9472348634e05b49f9d3a9f4dcc221c (diff) | |
| parent | cba1d29b7ff041dc222d69640f4d4330d31f7ea1 (diff) | |
| download | tor-d4a61c76a1f4e21671cb93c1d5df1e31f9adc117.tar.gz tor-d4a61c76a1f4e21671cb93c1d5df1e31f9adc117.zip | |
Merge branch 'maint-0.2.2'
Conflicts:
src/or/dirserv.h
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuituse.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 30fd818395..10593c0da3 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -434,11 +434,11 @@ circuit_expire_building(void) "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d (%s)", (long)(now.tv_sec - victim->timestamp_created.tv_sec), - victim->purpose, + victim->purpose, circuit_purpose_to_string(victim->purpose)); } else if (circuit_build_times_count_close(&circ_times, - first_hop_succeeded, - victim->timestamp_created.tv_sec)) { + first_hop_succeeded, + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -771,7 +771,8 @@ circuit_expire_old_circuits_clientside(void) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < + now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", |