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

[nickm at torproject.org]

commit 6f101f96a64bf7a71937b2f7eb17e33f576f6381
Merge: 647dbf6 1221c5a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 2 07:40:53 2016 -0500

    Merge branch 'maint-0.2.9'

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