From: David Goulet <dgoulet@torproject.org>
Date: Thu, 2 Jul 2020 11:20:57 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.6~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into maint-0.4.3
---

5a5ff3d8c5d6b27d5c0371a3bbb0113332e2a9f9