From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Aug 2020 18:20:39 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2' into release-0.4.2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.4.2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2' into release-0.4.2
---

5b345c693e73ad636a3dce9ca1e8622e1df8ed26