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

[nickm at torproject.org]

commit 3e4a1ed7bb1e67a81f47dc8067774d2907a15c81
Merge: 4c5eb0b 87c000d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 20:40:12 2016 -0500

    Merge branch 'maint-0.2.9'

 src/test/test_hs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)