From: Roger Dingledine Date: Sat, 21 May 2011 22:13:46 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.28-beta~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5269d106d862810ac000aa8fb1bc0e38b42b5327;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 5269d106d862810ac000aa8fb1bc0e38b42b5327