diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:36:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:36:25 -0400 |
| commit | 597cd893c557f8e05be98b6cade1b312fc6f0f8d (patch) | |
| tree | e0739825eef13b029be94b06ea742d38f888aad4 /src/or/config.c | |
| parent | 01407f9718a7b1eb4e43b46c2799a390551aad29 (diff) | |
| parent | 7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e (diff) | |
| download | tor-597cd893c557f8e05be98b6cade1b312fc6f0f8d.tar.gz tor-597cd893c557f8e05be98b6cade1b312fc6f0f8d.zip | |
Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
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; } |