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

[nickm at torproject.org]

commit 6c4aee147eae0c7b2190c8925bc7f6e2581fa743
Merge: 68a10b6 e482541
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 16:10:48 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 src/test/test_dir.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)