From: Roger Dingledine <arma@torproject.org>
Date: Tue, 25 Oct 2011 23:34:20 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.34~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e76f626ff6aa4f7ea869996f10b073a3f951f040;p=thirdparty%2Ftor.git

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

e76f626ff6aa4f7ea869996f10b073a3f951f040