commit 9c52846fe5ab6f0d2ef99f665844037f910a62cc Merge: f863870398 399518da02 Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 12:52:08 2021 +0000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40301 | 4 ++++ src/feature/dircache/dircache.c | 35 +++++++++++++++++++---------------- src/feature/dircache/dircache.h | 2 +- src/lib/compress/compress_zstd.c | 4 ++-- src/test/test_dir.c | 26 -------------------------- 5 files changed, 26 insertions(+), 45 deletions(-)