commit d35a555348dfccb19d7534af24d3c364372d515b Merge: f118dc8 ca53829 Author: Nick Mathewson nickm@torproject.org Date: Mon May 30 15:50:35 2011 -0400

Merge branch 'bug3289' into maint-0.2.2

changes/bug3289 | 5 +++++ src/or/rendservice.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 0 deletions(-)