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

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

c2cc180c46c3e3dc593890fef5adaa9fdca7b430