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