Merge branch 'maint-0.3.5' into maint-0.4.2

torproject · Aug 13, 2020 · 45d9830 · 45d9830
2 parents 07f0210 + 72484a4
commit 45d9830
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changes/bug40099 b/changes/bug40099
@@ -0,0 +1,4 @@
+  o Minor bugfixes (tests):
+    - Fix the behavior of the rend_cache/clean_v2_descs_as_dir when run on
+      its own.  Previously, it would exit with an error.
+      Fixes bug 40099; bugfix on 0.2.8.1-alpha.
diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c
@@ -1101,6 +1101,7 @@ test_rend_cache_clean_v2_descs_as_dir(void *data)
   desc->timestamp = now;
   desc->pk = pk_generate(0);
   e->parsed = desc;
+  rend_cache_increment_allocation(rend_cache_entry_allocation(e));
   digestmap_set(rend_cache_v2_dir, key, e);
 
   /* Set the cutoff to minus 10 seconds. */
@@ -1250,4 +1251,3 @@ struct testcase_t rend_cache_tests[] = {
     test_rend_cache_validate_intro_point_failure, 0, NULL, NULL },
   END_OF_TESTCASES
 };
-