From: Nick Mathewson Date: Thu, 30 Jan 2020 16:19:23 +0000 (-0500) Subject: Merge branch 'maint-0.4.1' into maint-0.4.2 X-Git-Tag: tor-0.4.2.7~16^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5e610af05dc7112a9b3aa18feeb6ba63290ff5c;p=thirdparty%2Ftor.git Merge branch 'maint-0.4.1' into maint-0.4.2 Using "ours" strategy to avoid version bump --- c5e610af05dc7112a9b3aa18feeb6ba63290ff5c