commit 6307a759ed5ce48f31a5c36b08f2563cbb226389 Merge: 5e08cf350 6507ecb7e Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 29 11:11:09 2017 -0400

Merge remote-tracking branch 'dgoulet/bug22159_031_01' into maint-0.3.1

changes/bug22159 | 7 +++++++ src/or/rendservice.c | 34 +++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-)