From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Aug 2020 17:24:11 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into maint-0.4.3
X-Git-Tag: tor-0.4.3.7~28^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39d5e7c76464f4e6dae9762210363de3da7230df;p=thirdparty%2Ftor.git

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

39d5e7c76464f4e6dae9762210363de3da7230df