commit 838ec086beeb83d10e1c50b2027fe7509e153c8c Merge: d4de312 6fd61cf Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 9 12:22:29 2012 -0500

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

changes/bug4856 | 3 +++ src/or/rendservice.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)