From: Nick Mathewson Date: Fri, 18 Mar 2011 16:39:40 +0000 (-0400) Subject: Merge remote branch 'sebastian/bug2696' into maint-0.2.2 X-Git-Tag: tor-0.2.2.24-alpha~4^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3d666366555226ec2ad0f647489a1d42145a2eb;p=thirdparty%2Ftor.git Merge remote branch 'sebastian/bug2696' into maint-0.2.2 --- f3d666366555226ec2ad0f647489a1d42145a2eb