commit 64676d05714a8248610bdbbc6270966ed440a33c Merge: 939d01f 778d901 Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 11:20:58 2012 -0400

Merge branch 'bug6638'

src/or/rendservice.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-)