From: Roger Dingledine <arma@torproject.org>
Date: Fri, 28 Oct 2011 00:04:51 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.7-alpha~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=425e4236c6c3af653565763cfa9e921aa73cf9e0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

425e4236c6c3af653565763cfa9e921aa73cf9e0