commit 926914a09c4aa83c3f54d95d0165e2f97c8ca81d Merge: c151f4644 fa87aa00c Author: Nick Mathewson <nickm@torproject.org> Date: Fri Sep 8 09:01:39 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23429_032_01' src/or/rendservice.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)