commit 587cc311407e10c04962a9dd69513cc5a71aedd5 Merge: 6a320b9 80038b5 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 2 15:07:08 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/rendclient.c
changes/bug3309 | 13 +++++++++++++ src/or/main.c | 3 +-- src/or/rendclient.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- src/or/rendclient.h | 3 +++ src/or/rendcommon.c | 4 +++- 5 files changed, 63 insertions(+), 6 deletions(-)
diff --cc src/or/rendclient.c index 67d246a,533dfb8..3e9c6e8 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@@ -413,12 -433,11 +434,11 @@@ lookup_last_hid_serv_request(routerstat * it does not contain requests older than REND_HID_SERV_DIR_REQUERY_PERIOD * seconds any more. */ static void -directory_clean_last_hid_serv_requests(void) +directory_clean_last_hid_serv_requests(time_t now) { strmap_iter_t *iter; - time_t cutoff = time(NULL) - REND_HID_SERV_DIR_REQUERY_PERIOD; + time_t cutoff = now - REND_HID_SERV_DIR_REQUERY_PERIOD; - if (!last_hid_serv_requests) - last_hid_serv_requests = strmap_new(); + strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); for (iter = strmap_iter_init(last_hid_serv_requests); !strmap_iter_done(iter); ) { const char *key;