From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Mar 2020 16:17:20 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.4-rc~25^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d925d2995c6b11e4fea3a0637544c23b0b90ff95;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3

"ours" to avoid version bump.
---

d925d2995c6b11e4fea3a0637544c23b0b90ff95