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

[nickm at torproject.org]

commit 2a537af45236d37724edc0396b4366cd1eca7d1e
Merge: d3874e4 87c000d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Dec 11 20:40:08 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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