commit 32918e954fa3c2d55eb6b7695bd833197c31e09e Merge: 26456d3 2c0258b Author: Nick Mathewson <ni...@torproject.org> Date: Thu Apr 28 15:57:27 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/rendcommon.h changes/forget-rend-descs-on-newnym | 9 ++++ src/or/circuituse.c | 19 ++++++--- src/or/main.c | 2 + src/or/rendclient.c | 76 ++++++++++++++++++++++++++++------ src/or/rendclient.h | 1 + src/or/rendcommon.c | 10 +++++ src/or/rendcommon.h | 1 + 7 files changed, 98 insertions(+), 20 deletions(-) diff --cc src/or/rendcommon.h index 36d7e4a,44b5227..18d42b8 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@@ -34,8 -34,9 +34,9 @@@ void rend_encoded_v2_service_descriptor void rend_intro_point_free(rend_intro_point_t *intro); void rend_cache_init(void); -void rend_cache_clean(void); -void rend_cache_clean_v2_descs_as_dir(void); +void rend_cache_clean(time_t now); +void rend_cache_clean_v2_descs_as_dir(time_t now); + void rend_cache_purge(void); void rend_cache_free_all(void); int rend_valid_service_id(const char *query); int rend_cache_lookup_desc(const char *query, int version, const char **desc, _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits