aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-03-18 16:36:52 -0400
committerNick Mathewson <nickm@torproject.org>2013-03-18 16:36:52 -0400
commit6e94d2fb3a11d7cba5796c1662e0c5089ad3e509 (patch)
treea6a4224cba01288c6c0161d02f97eb05ddc4ccb6 /src/or/config.c
parentb0f7af16156ef7d0c401485c6e7a533857f7b316 (diff)
parent597cd893c557f8e05be98b6cade1b312fc6f0f8d (diff)
downloadtor-6e94d2fb3a11d7cba5796c1662e0c5089ad3e509.tar.gz
tor-6e94d2fb3a11d7cba5796c1662e0c5089ad3e509.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index da5f97eace..0ebf3b6942 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1503,7 +1503,7 @@ options_act(const or_options_t *old_options)
"preferred or excluded node lists. "
"Abandoning previous circuits.");
circuit_mark_all_unused_circs();
- circuit_expire_all_dirty_circs();
+ circuit_mark_all_dirty_circs_as_unusable();
revise_trackexithosts = 1;
}