From: Nick Mathewson Date: Mon, 4 Jun 2012 15:40:52 +0000 (-0400) Subject: Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2 X-Git-Tag: tor-0.2.2.37~6^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=491dc3a601d7c2610503f73192bd1a40bcb37ab2;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2 --- 491dc3a601d7c2610503f73192bd1a40bcb37ab2