commit 4258728d56cb02d36baa785200a0d04f5b4c8fa6 Merge: 828033001 6ecf9590e Author: teor teor@torproject.org Date: Tue Mar 26 19:15:46 2019 +1000

Merge remote-tracking branch 'tor-github/pr/852' into 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(-)