Merge branch 'maint-0.4.3' into release-0.4.3

This commit is contained in:
Nick Mathewson 2020-08-13 14:20:39 -04:00
commit e78ce52aff
2 changed files with 5 additions and 0 deletions

4
changes/bug40099 Normal file
View File

@ -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.

View File

@ -1095,6 +1095,7 @@ test_rend_cache_clean_v2_descs_as_dir(void *data)
desc->timestamp = now; desc->timestamp = now;
desc->pk = pk_generate(0); desc->pk = pk_generate(0);
e->parsed = desc; e->parsed = desc;
rend_cache_increment_allocation(rend_cache_entry_allocation(e));
digestmap_set(rend_cache_v2_dir, key, e); digestmap_set(rend_cache_v2_dir, key, e);
/* Set the cutoff to minus 10 seconds. */ /* Set the cutoff to minus 10 seconds. */