From: Roger Dingledine <arma@torproject.org>
Date: Wed, 28 Sep 2011 19:38:02 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.5-alpha~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36829539d64dab47e07bd619b7b833ef50d26853;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

36829539d64dab47e07bd619b7b833ef50d26853