From: Roger Dingledine Date: Thu, 7 Jul 2011 17:26:50 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.30-rc~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0640d09bf4be273fa4cfc18c30de30677a6d24fa;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 0640d09bf4be273fa4cfc18c30de30677a6d24fa