From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Feb 2020 19:17:09 +0000 (-0500)
Subject: Merge branch 'maint-0.4.0' into release-0.4.0
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Frelease-0.4.0;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0' into release-0.4.0
---

ed2cbbf71680fd2be67eb7b74c44572e58895d72