commit 44691285452f0220813e30f01f86e4496d3fd601 Merge: 84e9060f4 c8aa3cc17 Author: teor <teor@torproject.org> Date: Fri Oct 25 10:38:18 2019 +1000 Merge branch 'maint-0.4.2' into release-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(-)