commit 06426508655590fee73696a6d398d8ed7f9af1ed Merge: 3d38d0ca2 4258728d5 Author: teor teor@torproject.org Date: Tue Mar 26 19:16:06 2019 +1000

Merge branch 'maint-0.4.0'

changes/ticket21377 | 4 ++ src/feature/dircache/dircache.c | 42 +++++++++++++++- src/test/test_dir_handle_get.c | 106 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 1 deletion(-)