From: Roger Dingledine Date: Fri, 3 Jun 2011 19:25:54 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.28-beta~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6d9df241cfd6bb4af18b57b45f725e2c6c79fb5;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- d6d9df241cfd6bb4af18b57b45f725e2c6c79fb5