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