commit 5938804d17f6b458fcec9d479cd734d2e0256631 Merge: 98abe14 30b3f0c Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 15 15:14:12 2011 -0400

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

src/or/rendclient.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)