From: Roger Dingledine <arma@torproject.org>
Date: Thu, 7 Jul 2011 17:29:19 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2' into release-0.2.2
X-Git-Tag: tor-0.2.2.30-rc~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4cdf6ac336351de937f2367f2c23546ad171cd29;p=thirdparty%2Ftor.git

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

4cdf6ac336351de937f2367f2c23546ad171cd29