From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 May 2020 14:25:27 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1' into release-0.4.1
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.4.1;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1' into release-0.4.1
---

d97fd7f0762603702179bf2742e0fe5fc66bedbf