From: Nick Mathewson Date: Tue, 21 Dec 2010 20:53:03 +0000 (-0500) Subject: Merge remote branch 'public/bug2060' into maint-0.2.2 X-Git-Tag: tor-0.2.3.1-alpha~209^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e895919b171029df4d38285b0be4483376b4ad25;p=thirdparty%2Ftor.git Merge remote branch 'public/bug2060' into maint-0.2.2 --- e895919b171029df4d38285b0be4483376b4ad25