From: Roger Dingledine Date: Wed, 26 Oct 2011 22:35:30 +0000 (-0400) Subject: Merge branch 'maint-0.2.2' into release-0.2.2 X-Git-Tag: tor-0.2.2.34~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cf53d77fe1bd9dc8926e9d63f00ba0f44cc5c25b;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.2' into release-0.2.2 --- cf53d77fe1bd9dc8926e9d63f00ba0f44cc5c25b