From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 30 Apr 2019 19:54:03 +0000 (-0400)
Subject: Merge branch 'maint-0.4.0'
X-Git-Tag: tor-0.4.1.1-alpha~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39bd10dca65fb4007a3da2a15323e6a8bebfd0aa;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0'

"ours" to avoid version bump
---

39bd10dca65fb4007a3da2a15323e6a8bebfd0aa