commit 3ac426afe8f169cb2c16de9d37b8630b7c3216f5 Merge: fffc59b 2f59d6e Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 8 12:41:03 2014 -0400

Merge remote-tracking branch 'public/bug4241'

changes/bug4241 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)