From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 26 Jul 2019 01:52:02 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=142612bd16f47c9ebe9ac50bc394b07c1026574b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" to avoid version bump.
---

142612bd16f47c9ebe9ac50bc394b07c1026574b