From: Roger Dingledine <arma@torproject.org>
Date: Thu, 8 Dec 2011 22:23:58 +0000 (-0500)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.35~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fdfc10092da66b342dc06a590e0ca1d348b55be;p=thirdparty%2Ftor.git

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

9fdfc10092da66b342dc06a590e0ca1d348b55be