commit 890780054975e0c5eb95b097deb6fac53640f66d Merge: 6e3a7c410f d98c77b78e Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 22 15:39:30 2021 -0500 Merge remote-tracking branch 'tor-gitlab/mr/319' 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(-)