From: Nick Mathewson Date: Wed, 12 Jan 2011 19:00:20 +0000 (-0500) Subject: Merge remote branch 'public/bug2363' into maint-0.2.2 X-Git-Tag: tor-0.2.3.1-alpha~180^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43e12a79885871cdf18bfe6cc835b2414d21e29d;p=thirdparty%2Ftor.git Merge remote branch 'public/bug2363' into maint-0.2.2 --- 43e12a79885871cdf18bfe6cc835b2414d21e29d