diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-09 16:14:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-09 16:15:05 -0400 |
| commit | ed3d7892c721c9495215ecad2e18c026d29fbb9b (patch) | |
| tree | c24abed153d4b2ef77748c41333f2dac5b2bd377 /src/or/main.c | |
| parent | f5ce580babc5ca8466da02c53669a58bde8f5445 (diff) | |
| download | tor-ed3d7892c721c9495215ecad2e18c026d29fbb9b.tar.gz tor-ed3d7892c721c9495215ecad2e18c026d29fbb9b.zip | |
Fix a bug where streams would linger forever when we had no dirinfo
fixes bug 8387; fix on 0.1.1.11-alpha (code), or on 0.2.4.10-alpha (behavior).
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c index bd23141b97..495a71f89e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1485,8 +1485,11 @@ run_scheduled_events(time_t now) * and we make a new circ if there are no clean circuits. */ have_dir_info = router_have_minimum_dir_info(); - if (have_dir_info && !net_is_disabled()) + if (have_dir_info && !net_is_disabled()) { circuit_build_needed_circs(now); + } else { + circuit_expire_old_circs_as_needed(now); + } /* every 10 seconds, but not at the same second as other such events */ if (now % 10 == 5) |