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

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.
---

190cda0e2ba2faa300758f4899a6c28de6886bfc