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

Merge branch 'maint-0.4.1'

"ours" to avoid version bump.
---

3a9b41895f63ab8fac97c1afbb0be76cc7ead081