From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Sep 2009 03:37:27 +0000 (-0400)
Subject: Merge commit 'origin/maint-0.2.1'
X-Git-Tag: tor-0.2.2.2-alpha~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb78602379c336f40cf4e880d45ba4e766fb8c31;p=thirdparty%2Ftor.git

Merge commit 'origin/maint-0.2.1'

[Do not take conflicting change to rendclient.c]
---

cb78602379c336f40cf4e880d45ba4e766fb8c31