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

Merge branch 'maint-0.2.2'
---

ba91272dedf9bacd7e7ef176c8a549f3aa5da452