commit 7a32689b3ef52a7e0d56a4d091e08b1a4d226498 Merge: 5d87e0e f8a7972 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 1 09:50:36 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20638 | 5 + src/or/config.c | 34 ----- src/or/rendservice.c | 352 +++++++++++++++++++++++++++++++++++---------------- src/or/rendservice.h | 16 ++- src/test/test_hs.c | 120 ++++++++++++++---- 5 files changed, 349 insertions(+), 178 deletions(-)