From: Nick Mathewson Date: Mon, 9 May 2016 18:58:38 +0000 (-0400) Subject: Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8 X-Git-Tag: tor-0.2.8.3-alpha~37 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72601d7e21c88a236d4825a3716556be114601df;p=thirdparty%2Ftor.git Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8 This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the cherry-picked fix of 18490 --- 72601d7e21c88a236d4825a3716556be114601df