commit 87c000d19e40d97561076d043fdaa778bd48c124 Merge: a40d212 f3c040e Author: Nick Mathewson nickm@torproject.org Date: Sun Dec 11 20:40:01 2016 -0500

Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9

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