Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/rendclient.c

diff --cc src/or/main.c
Simple merge

diff --cc src/or/rendclient.c
index 67d246acf67f431f06f91d61197e93b9c47f4cc4,533dfb8a970648fd7d8ba519d8274ec883a62080..3e9c6e8e55c86ded1fa791b483704efd5d97ba56
--- 1/src/or/rendclient.c
--- 2/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;

diff --cc src/or/rendcommon.c
Simple merge