commit c8aa3cc17d9cf28ea98c4619984b3f9c0afa3f3a Merge: acd27f4b4 3867ca492 Author: teor <teor@torproject.org> Date: Fri Oct 25 10:38:01 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1466' into 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(-)