From: Roger Dingledine <arma@torproject.org>
Date: Thu, 5 Jan 2012 11:43:13 +0000 (-0500)
Subject: Merge branch 'maint-0.2.1' into release-0.2.1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.2.1;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1' into release-0.2.1
---

7da1ae7adf150271a947997a1340f62b990c974d