commit 4334a4b784e6c2fb0f969f1a037f85bcd1c3b4fc Merge: e69afb8 1636777 Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 18 09:08:16 2017 -0500

Merge remote-tracking branch 'dgoulet/bug21033_030_01'

changes/bug21033 | 5 +++++ src/or/rendservice.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-)