From: Roger Dingledine <arma@torproject.org>
Date: Tue, 13 Sep 2011 22:34:12 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.33~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4ed8622c01fc1f2f93a44d4b3e0857b6da94620;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2' into release-0.2.2
---

a4ed8622c01fc1f2f93a44d4b3e0857b6da94620