commit a91f52a443e605a5b8efd4fe0d4032512c23b6cd Merge: b3d035d5c c8aa3cc17 Author: teor <teor@torproject.org> Date: Fri Oct 25 10:38:22 2019 +1000 Merge branch 'maint-0.4.2' changes/ticket31958 | 5 +++++ src/feature/dircache/dircache.c | 10 ++++++++-- src/feature/dircommon/directory.c | 23 +++++++++++++++++++---- 3 files changed, 32 insertions(+), 6 deletions(-)