nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2' into release-0.4.2

Browse Source
This commit is contained in:
Nick Mathewson 2020-08-13 14:20:39 -04:00
commit 5b345c693e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.

2
src/test/test_rendcache.c
View File

@ -1101,6 +1101,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. */
@ -1250,4 +1251,3 @@ struct testcase_t rend_cache_tests[] = {
test_rend_cache_validate_intro_point_failure, 0, NULL, NULL }, test_rend_cache_validate_intro_point_failure, 0, NULL, NULL },
END_OF_TESTCASES END_OF_TESTCASES
}; };