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

[nickm at torproject.org]

commit a1c06b84b31cbc1c7e0f57928de66d9d1159ce4a
Merge: 52bb38868 edb6acf9c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:19:28 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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