From: Roger Dingledine Date: Tue, 5 Jun 2012 22:38:32 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.37~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f62f420feb5e5d29ca9db4ea0e486b11023844f;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 4f62f420feb5e5d29ca9db4ea0e486b11023844f