From: Nick Mathewson Date: Tue, 11 Feb 2020 13:53:00 +0000 (-0500) Subject: Merge branch 'maint-0.4.1' into maint-0.4.2 X-Git-Tag: tor-0.4.2.7~14^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=00fe214729b935adc522883fa84b399429fefa74;p=thirdparty%2Ftor.git Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" merge, since the exceptions.txt file is already fixed in this branch. --- 00fe214729b935adc522883fa84b399429fefa74