diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-09-18 09:45:25 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-09-18 09:45:25 -0400 |
| commit | 814fa6d636da2acd1733dcfc1cf59e12ccfc804a (patch) | |
| tree | ab02ac58890279ac895895c27e82c98263ce025e | |
| parent | 3ee664bb332f88a64d1daecbca687262872b1364 (diff) | |
| parent | 7945e075a42aecaa633565ebbc5d3b809ed24e7e (diff) | |
| download | tor-814fa6d636da2acd1733dcfc1cf59e12ccfc804a.tar.gz tor-814fa6d636da2acd1733dcfc1cf59e12ccfc804a.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rw-r--r-- | changes/ticket40126 | 4 | ||||
| -rw-r--r-- | src/test/test_rendcache.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket40126 b/changes/ticket40126 new file mode 100644 index 0000000000..1f5806e6cb --- /dev/null +++ b/changes/ticket40126 @@ -0,0 +1,4 @@ + o Testing (onion service v2): + - Fix another rendezvous cache unit test that was triggering an underflow on the + global rend cache allocation. Fixes bug 40126; bugfix on + 0.2.8.1-alpha. diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 92e135f3b1..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(); |