commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson nickm@torproject.org Date: Thu May 10 09:19:09 2018 -0400

Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

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