summaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-04-23 19:46:29 -0400
committerRoger Dingledine <arma@torproject.org>2010-04-23 19:46:29 -0400
commitb3019c6d2b0314042dfffade021497db51e4964a (patch)
tree70ea163b4f88d46029e2d3869758bfa15ec03359 /src/or/main.c
parent45ab6959c9b77ffbc03ff6b7515f1c7d0af35d45 (diff)
parentb2641920835b046ae820c608136dfbef1a557fb0 (diff)
downloadtor-b3019c6d2b0314042dfffade021497db51e4964a.tar.gz
tor-b3019c6d2b0314042dfffade021497db51e4964a.zip
Merge branch 'maint-0.2.1'
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c
index ccc25c5636..017f72baca 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1134,6 +1134,10 @@ run_scheduled_events(time_t now)
if (have_dir_info && !we_are_hibernating())
circuit_build_needed_circs(now);
+ /* every 10 seconds, but not at the same second as other such events */
+ if (now % 10 == 5)
+ circuit_expire_old_circuits_serverside(now);
+
/** 5. We do housekeeping for each connection... */
connection_or_set_bad_connections();
for (i=0;i<smartlist_len(connection_array);i++) {