From: Roger Dingledine <arma@torproject.org>
Date: Tue, 13 Sep 2011 22:32:00 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.4-alpha~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1fcaeb60924d155e80a9579588a1b6c31e2174f7;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'
---

1fcaeb60924d155e80a9579588a1b6c31e2174f7