Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3

This commit is contained in:
Nick Mathewson
2012-09-04 18:33:56 -04:00
2 changed files with 10 additions and 1 deletions
+1 -1
View File
@@ -372,7 +372,7 @@ circuit_expire_building(void)
} while (0)
SET_CUTOFF(general_cutoff, circ_times.timeout_ms);
SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms / 2.0);
SET_CUTOFF(begindir_cutoff, circ_times.timeout_ms);
SET_CUTOFF(fourhop_cutoff, circ_times.timeout_ms * (4/3.0));
SET_CUTOFF(cannibalize_cutoff, circ_times.timeout_ms / 2.0);
SET_CUTOFF(close_cutoff, circ_times.close_ms);