From: Roger Dingledine <arma@torproject.org>
Date: Wed, 26 Oct 2011 21:14:39 +0000 (-0400)
Subject: Merge branch 'maint-0.2.1' into maint-0.2.2
X-Git-Tag: tor-0.2.2.34~5^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f85c56182f485bea483288a26fd74cefcb87653a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.1' into maint-0.2.2
---

f85c56182f485bea483288a26fd74cefcb87653a