tor

commit 761dd9f2ab240fb6ce80087e1c2feecd095d71f9
parent 37b21591502d080b5f8ba9c1d0b37bd226b7f183
Author: Mike Perry <mikeperry-git@torproject.org>
Date:   Wed, 21 Oct 2020 18:17:30 -0500

Lower min circ timeout from 1.5s to bin width (10ms)

Diffstat:
M
src/core/or/circuitstats.c
 | 
2
+-
M
src/core/or/circuitstats.h
 | 
4
++--

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/core/or/circuitstats.c b/src/core/or/circuitstats.c
@@ -1794,7 +1794,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
     return;
 
   if (cbt->timeout_ms < circuit_build_times_min_timeout()) {
-    log_info(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms",
+    log_notice(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms",
              cbt->timeout_ms, circuit_build_times_min_timeout());
     cbt->timeout_ms = circuit_build_times_min_timeout();
     if (cbt->close_ms < cbt->timeout_ms) {
diff --git a/src/core/or/circuitstats.h b/src/core/or/circuitstats.h
@@ -119,8 +119,8 @@ double circuit_build_times_quantile_cutoff(void);
 #define CBT_MAX_TEST_FREQUENCY INT32_MAX
 
 /** Lowest allowable value for CircuitBuildTimeout in milliseconds */
-#define CBT_DEFAULT_TIMEOUT_MIN_VALUE (1500)
-#define CBT_MIN_TIMEOUT_MIN_VALUE 500
+#define CBT_DEFAULT_TIMEOUT_MIN_VALUE (CBT_BIN_WIDTH)
+#define CBT_MIN_TIMEOUT_MIN_VALUE CBT_BIN_WIDTH
 #define CBT_MAX_TIMEOUT_MIN_VALUE INT32_MAX
 
 /** Initial circuit build timeout in milliseconds */