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

[nickm at torproject.org]

commit f36fea697eb480d9e67cfbd69b122427802fea85
Merge: 62b224f72 f64fa6b19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:19:28 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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