commit 34d418009d99931000870b535222e901ace52c1f Merge: a15009bd3 15b8c860d Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 09:19:28 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)