commit 5fd8f3b71d5c0d8dc9827d107215af91ecae4d78 Merge: 9ca9e6a1f ba7043921 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)