commit ceebc8283f4ba8fbc19c0b788d855855f5bbdbb8 Merge: 21dd6ea ca282e5 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 11:48:02 2011 -0500

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

changes/bug4424 | 6 ++++++ src/or/rendclient.c | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)