From: Nick Mathewson Date: Thu, 3 Nov 2016 19:44:30 +0000 (-0400) Subject: Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8 X-Git-Tag: tor-0.2.8.10~8^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a45ef5a4706aab57abcf170c10080811223175e;p=thirdparty%2Ftor.git Merge remote-tracking branch 'arma/bug19969_028_squashed' into maint-0.2.8 --- 7a45ef5a4706aab57abcf170c10080811223175e