commit bd9c7946b9465dd83e20f6c3ea1e11f853e4af0f Merge: 67e412c25e 70d8fb3eab Author: Alexander Færøy ahf@torproject.org Date: Wed Aug 11 12:48:04 2021 +0000

Merge branch 'maint-0.4.5' into release-0.4.5

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