From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 20 Aug 2019 15:15:57 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b180703a293991849b91160cf6070d7d570738f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" to avoid 0.4.1 bump.
---

6b180703a293991849b91160cf6070d7d570738f