commit 9d5a9feb404c61d93309eea1c68fcae3ff0cf8f3 Merge: 1ec429d eea7634 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 3 09:54:24 2017 -0500 Merge branch 'dgoulet/bug21302_030_01_squashed' changes/bug21302 | 8 ++++++++ src/or/rendservice.c | 47 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 12 deletions(-)