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

[nickm at torproject.org]

commit 9271dc5a6baf1620495db4b30587090925238a52
Merge: b7613e0 1221c5a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 2 07:40:45 2016 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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