commit f0589da0e3270e627ac6fd249976234a4c085d3f Merge: 9452b65 8adec87 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 9 11:04:40 2011 -0500

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug4426 | 8 ++++++++ src/or/rendservice.c | 9 ++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)