From: Nick Mathewson Date: Wed, 6 May 2020 20:53:06 +0000 (-0400) Subject: Merge branch 'maint-0.4.1' into maint-0.4.2 X-Git-Tag: tor-0.4.3.5~12^2~2^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f954514b376e6edbe8b1faba0726bdb46acf7729;p=thirdparty%2Ftor.git Merge branch 'maint-0.4.1' into maint-0.4.2 This is an "ours" merge to avoid taking the 0.4.1 version of the 34078 fix. --- f954514b376e6edbe8b1faba0726bdb46acf7729