From: Nick Mathewson Date: Wed, 28 Dec 2011 21:50:45 +0000 (-0500) Subject: Merge remote-tracking branch 'public/bug4788' into maint-0.2.2 X-Git-Tag: tor-0.2.3.11-alpha~59^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84bf8e3808d5f10e5ffd0d9f9f31760c6d3875ab;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/bug4788' into maint-0.2.2 --- 84bf8e3808d5f10e5ffd0d9f9f31760c6d3875ab