diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-05-29 19:11:22 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-05-29 19:11:22 -0400 |
| commit | 688400c596c09e9a6d1a26668e4843ccd946a7be (patch) | |
| tree | 9a8fd299211d3744df5e2227cd55842576f8c3b1 | |
| parent | 67462937a24d24c04146e2547d853b4a42c0d718 (diff) | |
| parent | 5f182ea10e25ed027cf75627f74013e7c6da2038 (diff) | |
| download | tor-688400c596c09e9a6d1a26668e4843ccd946a7be.tar.gz tor-688400c596c09e9a6d1a26668e4843ccd946a7be.zip | |
Merge branch 'maint-0.2.2' into release-0.2.2
| -rw-r--r-- | src/or/circuitbuild.c | 2 | ||||
| -rw-r--r-- | src/or/main.c | 5 |
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' |