From: Roger Dingledine Date: Fri, 20 May 2011 07:03:01 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.28-beta~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16bfb4d6c74e2077e5bdca7156ef281b61ed050d;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 16bfb4d6c74e2077e5bdca7156ef281b61ed050d