commit b4c648c6c0755e915fefb33431c2865382f11cf8 Merge: 4178708 42ec60e Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 5 08:13:09 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20864 | 4 ++++ src/test/test_hs.c | 13 ++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)