diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 12:33:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 12:33:54 -0400 |
| commit | 4b57ec6e5eabb822506416bc5cf0e291ff9c0053 (patch) | |
| tree | 2c1621d0f477f1929a94faa74d5ad1401fc6c519 /src/or/circuituse.c | |
| parent | 6917728637bdbaed86d48d394eab6a063c319269 (diff) | |
| parent | 16cfca501ff27dd11daa9dc75ba9f5d99c48bdf5 (diff) | |
| download | tor-4b57ec6e5eabb822506416bc5cf0e291ff9c0053.tar.gz tor-4b57ec6e5eabb822506416bc5cf0e291ff9c0053.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/circuituse.c
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index f176f346f8..f7274bd161 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -289,7 +289,6 @@ circuit_expire_building(void) struct timeval general_cutoff, begindir_cutoff, fourhop_cutoff, cannibalize_cutoff, close_cutoff, extremely_old_cutoff; struct timeval now; - struct timeval introcirc_cutoff; cpath_build_state_t *build_state; tor_gettimeofday(&now); @@ -308,8 +307,6 @@ circuit_expire_building(void) SET_CUTOFF(close_cutoff, circ_times.close_ms); SET_CUTOFF(extremely_old_cutoff, circ_times.close_ms*2 + 1000); - introcirc_cutoff = begindir_cutoff; - while (next_circ) { struct timeval cutoff; victim = next_circ; @@ -326,8 +323,6 @@ circuit_expire_building(void) cutoff = fourhop_cutoff; else if (TO_ORIGIN_CIRCUIT(victim)->has_opened) cutoff = cannibalize_cutoff; - else if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING) - cutoff = introcirc_cutoff; else if (victim->purpose == CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT) cutoff = close_cutoff; else @@ -338,12 +333,6 @@ circuit_expire_building(void) #if 0 /* some debug logs, to help track bugs */ - if (victim->purpose == CIRCUIT_PURPOSE_C_INTRODUCING && - victim->timestamp_created.tv_sec <= introcirc_cutoff && - victim->timestamp_created.tv_sec > general_cutoff) - log_info(LD_REND|LD_CIRC, "Timing out introduction circuit which we " - "would not have done if it had been a general circuit."); - if (victim->purpose >= CIRCUIT_PURPOSE_C_INTRODUCING && victim->purpose <= CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) { if (!victim->timestamp_dirty) |