From: Roger Dingledine Date: Sun, 29 May 2011 19:27:44 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.28-beta~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08843175f6966249935d05b767524e0916a0a3e9;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- 08843175f6966249935d05b767524e0916a0a3e9