commit 16e75587f6c6e1dd0d316e8360c966f4841dc32c Merge: 409984c 2f52fae Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 14:23:47 2016 -0400

Merge branch 'bug20527_030_01_squashed'

src/or/rendservice.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)