commit f8a7972b29b83c08c64a8bc04a19c2ef33f50ccb Merge: e2c8814 f80a43d Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 1 09:45:14 2016 -0500

Merge branch 'bug20638_029_v2_squashed' into maint-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(-)