[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit f64fa6b19ec7663f47e600599761fadbde4135e9
Merge: 59812789f 15b8c860d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:19:28 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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