commit 9decf86711133acf7ed2679831b21e53c9cb92ca Merge: 60e9795 6f27843 Author: Nick Mathewson nickm@torproject.org Date: Fri May 5 16:32:25 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket21978_031_02'

src/or/rendservice.c | 209 ++++++++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 93 deletions(-)