diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-06-15 16:10:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-06-15 16:10:59 -0400 |
| commit | bdfb399867e697e1afcbe0927a7aba685a587b1c (patch) | |
| tree | 47acc532ecd121187168c11f4e2dc3490022f50f /src/or/main.c | |
| parent | 879b1e10101f4eb5ecfb37c7a51f2882c2ac3ea1 (diff) | |
| parent | cc21e56ed4cfc9c83b2cbfef9a8ff088471f7925 (diff) | |
| download | tor-bdfb399867e697e1afcbe0927a7aba685a587b1c.tar tor-bdfb399867e697e1afcbe0927a7aba685a587b1c.tar.gz | |
Merge remote-tracking branch 'public/xxx023'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c index d9d64ced4..f8740d7b2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1435,11 +1435,8 @@ run_scheduled_events(time_t now) * We do this before step 4, so it can try building more if * 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? -NM - * It can't be lower than 1.5 seconds currently; see - * circuit_build_times_min_timeout(). -RD - */ + /* (If our circuit build timeout can ever become lower than a second (which + * it can't, currently), we should do this more often.) */ circuit_expire_building(); /** 3b. Also look at pending streams and prune the ones that 'began' |