commit 73182e322022611f8593af7b7ea141b96e8692ea Merge: d663400 f12fafa Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 15 16:29:43 2013 -0500 Merge remote-tracking branch 'public/bug8207' changes/bug8207 | 7 +++++++ src/or/rendservice.c | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-)