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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into maint-0.3.1

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