diff options
author | Sebastian Hahn <sebastian@torproject.org> | 2011-04-28 19:00:34 +0200 |
---|---|---|
committer | Sebastian Hahn <sebastian@torproject.org> | 2011-04-28 19:00:34 +0200 |
commit | 4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d (patch) | |
tree | c0f219599f0968d40ec486efacd4e91ee637bb01 /src/or/main.c | |
parent | 0130e7c9d2842ad58e1b84829aeab16a2efba3bb (diff) | |
parent | 8a36f2125137dc31a0771a8eeac0f2bb8c1343d0 (diff) | |
download | tor-4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d.tar tor-4b13ebd5ab4d051803e9cfde8bb965a4bf8ea90d.tar.gz |
Merge branch 'bug3k_021' into bug3k_022
Conflicts:
src/or/or.h
src/or/rendclient.c
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 169956849..3bf21693f 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -844,6 +844,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; } |