From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Dec 2019 18:31:17 +0000 (-0500)
Subject: Merge branch 'maint-0.4.0' into maint-0.4.1
X-Git-Tag: tor-0.4.1.7~5^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=db1065403ddabacd7c67273bff30f027151fb142;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.
---

db1065403ddabacd7c67273bff30f027151fb142