From: Nick Mathewson Date: Thu, 18 Jun 2015 15:30:01 +0000 (-0400) Subject: Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6 X-Git-Tag: tor-0.2.7.2-alpha~79^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f18ee7fc7287e9d5f55c7c6c2007a8a1c2466a3e;p=thirdparty%2Ftor.git Merge remote-tracking branch 'dgoulet/bug16381_026_01-revert' into maint-0.2.6 --- f18ee7fc7287e9d5f55c7c6c2007a8a1c2466a3e