commit 02aaa7f9edd333a40d364fd99f3c141dfe85b651 Merge: d73755e 619771f Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 24 11:37:41 2017 -0500 Merge branch 'maint-0.3.0' src/or/rendservice.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)