commit 0d3b3a4a2308c955f75825a145a22997b7008552 Merge: cc1943b 6f9e901 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 18 11:56:16 2015 -0400 Merge remote-tracking branch 'special/bug16060' changes/bug16060 | 4 ++++ src/or/rendservice.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)