diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-07-16 11:01:20 +0200 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-07-16 11:01:20 +0200 |
| commit | 7591ce64fbaae8d480224a93d62abda10011c2ba (patch) | |
| tree | 48d7d458c6418d737935a4beb6f4e960b04c3065 /src/or/main.c | |
| parent | 7bc7188fc94f6662690e07039b4e01dd8a92cdbc (diff) | |
| parent | 9e46855538e9b848b7c37fda502e5d109079cee0 (diff) | |
| download | tor-7591ce64fbaae8d480224a93d62abda10011c2ba.tar.gz tor-7591ce64fbaae8d480224a93d62abda10011c2ba.zip | |
Merge remote-tracking branch 'origin/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 8ba4fef1fd..b4b2faef15 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) |