nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-01 08:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine 2011-05-29 19:11:07 -04:00
commit 6917728637
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/circuitbuild.c
View File

@ -263,7 +263,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. * Effect: This is the minimum allowed timeout value in milliseconds.
* The minimum is to prevent rounding to 0 (we only check once * The minimum is to prevent rounding to 0 (we only check once

5
src/or/main.c
View File

@ -1352,7 +1352,10 @@ run_scheduled_events(time_t now)
* it's not comfortable with the number of available circuits. * it's not comfortable with the number of available circuits.
*/ */
/* XXXX022 If our circuit build timeout is much lower than a second, maybe /* 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(); circuit_expire_building();
/** 3b. Also look at pending streams and prune the ones that 'began' /** 3b. Also look at pending streams and prune the ones that 'began'