summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-05-29 18:52:37 -0400
committerRoger Dingledine <arma@torproject.org>2011-05-29 18:52:37 -0400
commit5f182ea10e25ed027cf75627f74013e7c6da2038 (patch)
tree91267d1ec76e7f7abec7bbdf83e46be7718f4048
parent1f18b5a5d532449f46a9c4b74d188870ea56d813 (diff)
downloadtor-5f182ea10e25ed027cf75627f74013e7c6da2038.tar.gz
tor-5f182ea10e25ed027cf75627f74013e7c6da2038.zip
answer an XXX nickm asked in aa950e6c4
-rw-r--r--src/or/circuitbuild.c2
-rw-r--r--src/or/main.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 108007e384..9509b5ad18 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -262,7 +262,7 @@ circuit_build_times_test_frequency(void)
}
/**
- * Retrieve and bounds-check the cbtmintimeout consensus paramter.
+ * Retrieve and bounds-check the cbtmintimeout consensus parameter.
*
* Effect: This is the minimum allowed timeout value in milliseconds.
* The minimum is to prevent rounding to 0 (we only check once
diff --git a/src/or/main.c b/src/or/main.c
index d1ceeec347..4fc643706c 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1162,7 +1162,10 @@ run_scheduled_events(time_t now)
* it's not comfortable with the number of available circuits.
*/
/* XXXX022 If our circuit build timeout is much lower than a second, maybe
- we should do this more often? */
+ * we should do this more often? -NM
+ * It can't be lower than 1.5 seconds currently; see
+ * circuit_build_times_min_timeout(). -RD
+ */
circuit_expire_building();
/** 3b. Also look at pending streams and prune the ones that 'began'