diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-28 15:57:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-28 15:57:27 -0400 |
| commit | 32918e954fa3c2d55eb6b7695bd833197c31e09e (patch) | |
| tree | 414b6ed3d4e1b98db8f05b4907006e4737024b0d /src/or/main.c | |
| parent | 26456d33546b674d5fa4d2c0112eeec561da7279 (diff) | |
| parent | 2c0258b69a232a7b11ecc999bee74dac1c1b1495 (diff) | |
| download | tor-32918e954fa3c2d55eb6b7695bd833197c31e09e.tar.gz tor-32918e954fa3c2d55eb6b7695bd833197c31e09e.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/rendcommon.h
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/main.c b/src/or/main.c index 6486f0c871..13b148f521 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1020,6 +1020,8 @@ signewnym_impl(time_t now) { circuit_expire_all_dirty_circs(); addressmap_clear_transient(); + rend_cache_purge(); + rend_client_cancel_descriptor_fetches(); time_of_last_signewnym = now; signewnym_is_pending = 0; } |