diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-08-13 14:20:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-08-13 14:20:39 -0400 |
| commit | ef18fb56c95c7761017eb8bb36a97415d7bb82ce (patch) | |
| tree | 848f95c5ee45810f3f451a48d924c113f0b32342 | |
| parent | 26b257757bf0e97da17c5e00ada166fdf2b68875 (diff) | |
| parent | 7915b651d9e926d829d2241a161c7afdaf0e7ffb (diff) | |
| download | tor-ef18fb56c95c7761017eb8bb36a97415d7bb82ce.tar.gz tor-ef18fb56c95c7761017eb8bb36a97415d7bb82ce.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
| -rw-r--r-- | changes/bug40099 | 4 | ||||
| -rw-r--r-- | src/test/test_rendcache.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug40099 b/changes/bug40099 new file mode 100644 index 0000000000..278ede2023 --- /dev/null +++ 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 index e396f9fd50..cfeb640e02 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1095,6 +1095,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. */ |