diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-16 10:01:56 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-16 10:01:56 +0200 |
| commit | 856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10 (patch) | |
| tree | 49e3514ff0e2aa892c172bf5d522a2ed15c75c05 /src/or/main.c | |
| parent | 35791f4238bd6853c038d5fc68976dd74c93c577 (diff) | |
| parent | ed3d7892c721c9495215ecad2e18c026d29fbb9b (diff) | |
| download | tor-856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10.tar.gz tor-856114ab1c5a8a7a1b7993ee34adbb7cbf4eaa10.zip | |
Merge remote-tracking branch 'public/bug8387_024' into maint-0.2.5
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 1c49ba1482..9c1cabf037 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1512,8 +1512,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) |