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/main.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/main.c')
| -rw-r--r-- | src/or/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 75a0971534..fd8b6cf674 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1125,7 +1125,7 @@ signewnym_impl(time_t now) return; } - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); addressmap_clear_transient(); rend_client_purge_state(); time_of_last_signewnym = now; @@ -1844,7 +1844,7 @@ do_hup(void) /* Rotate away from the old dirty circuits. This has to be done * after we've read the new options, but before we start using * circuits for directory fetches. */ - circuit_expire_all_dirty_circs(); + circuit_mark_all_dirty_circs_as_unusable(); /* retry appropriate downloads */ router_reset_status_download_failures(); |