diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-02 15:07:08 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-02 15:07:08 -0400 |
| commit | 587cc311407e10c04962a9dd69513cc5a71aedd5 (patch) | |
| tree | f1c97a05e73ef0a54e220b12d36cdd0edf7d14b3 /src/or/main.c | |
| parent | 6a320b99058ff19a2b71425e7cd6f267798411be (diff) | |
| parent | 80038b545359e5156fde6d6be4015bdf7f80e779 (diff) | |
| download | tor-587cc311407e10c04962a9dd69513cc5a71aedd5.tar.gz tor-587cc311407e10c04962a9dd69513cc5a71aedd5.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/rendclient.c
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 5b38edb86e..bb56be7c94 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1027,8 +1027,7 @@ signewnym_impl(time_t now) circuit_expire_all_dirty_circs(); addressmap_clear_transient(); - rend_cache_purge(); - rend_client_cancel_descriptor_fetches(); + rend_client_purge_state(); time_of_last_signewnym = now; signewnym_is_pending = 0; } |