From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Jul 2020 14:30:46 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.6^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70161785f94ee9e1571af4ec804bf57f877f40e8;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3

`-s ours` to avoid version bump.
---

70161785f94ee9e1571af4ec804bf57f877f40e8