aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-03-02 17:48:17 +0000
committerNick Mathewson <nickm@torproject.org>2004-03-02 17:48:17 +0000
commit6f3c6d128973253218a476cba9207c737b93d759 (patch)
tree30f2e3e64d7994e7785b9f078bb5f579bf03544f /src/or/main.c
parenta1e4c6dc853c4e2dba534e04045c1d15fd1f15b6 (diff)
downloadtor-6f3c6d128973253218a476cba9207c737b93d759.tar
tor-6f3c6d128973253218a476cba9207c737b93d759.tar.gz
Split out mark_for_close with circuits. Seems to work for me.
svn:r1197
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 3328ed2bb..c73c30d35 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -387,7 +387,10 @@ static void run_scheduled_events(time_t now) {
run_connection_housekeeping(i, now);
}
- /* 6. and blow away any connections that need to die. can't do this later
+ /* 6. And remove any marked circuits... */
+ circuit_close_all_marked();
+
+ /* 7. and blow away any connections that need to die. can't do this later
* because we might open up a circuit and not realize we're about to cull
* the connection it's running over.
* XXX we can remove this step once we audit circuit-building to make sure