From: Nick Mathewson Date: Tue, 7 Feb 2017 14:29:27 +0000 (-0500) Subject: Merge branch 'maint-0.2.6' into maint-0.2.7 X-Git-Tag: tor-0.2.8.13~11^2^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334;p=thirdparty%2Ftor.git Merge branch 'maint-0.2.6' into maint-0.2.7 "ours" merge to avoid reverting 17354, which was already fixed in 0.2.7.4-rc. --- 86d5a6fac04a3f78b3bd2a8a7a1f2d9776010334