commit 537092cdbb7f4be0e6d68f4e5d65ca2a403375f9 Merge: c08b7b10c c90961a92 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 10 20:18:28 2018 -0400

Merge branch 'ticket26223'

LICENSE | 30 ++++++ changes/bug26223 | 3 + configure.ac | 202 +++++++++++++++++++++-------------------- src/ext/getdelim.c | 78 ++++++++++++++++ src/ext/include.am | 2 +- src/feature/dircache/dirserv.c | 35 ++++--- src/lib/fs/.may_include | 3 + src/lib/fs/files.c | 4 + src/lib/fs/files.h | 39 ++++++++ 9 files changed, 280 insertions(+), 116 deletions(-)