commit 2eff709edb52e2bf6565dd8d00d7f2b79a05e60c Merge: 1eede00a4 f64fa6b19 Author: Nick Mathewson <nickm at torproject.org> Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.3' src/test/test_dir.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)