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

[nickm at torproject.org]

commit 7236e42684de017d66b38bac13c4f7ff8dac428c
Merge: 89edef6 e482541
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 16:10:55 2016 -0500

    Merge branch 'maint-0.2.9'

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