commit f7e8bd640a3c5e2227f991ea9ffe0fef3510d86d Merge: 6eb1b4b 42ec60e Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 5 08:13:14 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20864 | 4 ++++ src/test/test_hs.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)