Merge branch 'maint-0.3.5' into bug40133_035

2 files changed, 3 insertions, 4 deletions

diff --git a/src/feature/hs_common/shared_random_client.c b/src/feature/hs_common/shared_random_client.c
index 5772034c6d..3d6be94080 100644
--- a/src/feature/hs_common/shared_random_client.c
+++ b/src/feature/hs_common/shared_random_client.c
@@ -255,10 +255,6 @@ sr_state_get_start_time_of_current_protocol_run(void)
      protocol run */
   time_t time_elapsed_since_start_of_run = curr_round_slot * voting_interval;
 
-  log_debug(LD_GENERAL, "Current SRV proto run: Start of current round: %u. "
-            "Time elapsed: %u (%d)", (unsigned) beginning_of_curr_round,
-            (unsigned) time_elapsed_since_start_of_run, voting_interval);
-
   return beginning_of_curr_round - time_elapsed_since_start_of_run;
 }
 
diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
index 93f9f82953..8b0e2df485 100644
--- a/src/test/test_rendcache.c
+++ b/src/test/test_rendcache.c
@@ -954,6 +954,7 @@ test_rend_cache_free_all(void *data)
   one->parsed = desc_one;
   desc_one->timestamp = time(NULL) + TIME_IN_THE_PAST;
   desc_one->pk = pk_generate(0);
+  rend_cache_increment_allocation(rend_cache_entry_allocation(one));
   strmap_set_lc(rend_cache, "foo1", one);
 
   rend_cache_free_all();
@@ -978,11 +979,13 @@ test_rend_cache_entry_free(void *data)
 
   // Handles NULL descriptor correctly
   e = tor_malloc_zero(sizeof(rend_cache_entry_t));
+  rend_cache_increment_allocation(rend_cache_entry_allocation(e));
   rend_cache_entry_free(e);
 
   // Handles non-NULL descriptor correctly
   e = tor_malloc_zero(sizeof(rend_cache_entry_t));
   e->desc = tor_malloc(10);
+  rend_cache_increment_allocation(rend_cache_entry_allocation(e));
   rend_cache_entry_free(e);
 
  /* done: */