From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 May 2019 18:33:09 +0000 (-0400)
Subject: Merge branch 'maint-0.4.0'
X-Git-Tag: tor-0.4.1.1-alpha~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f13c2bd231886a84ef2359e4e060179ce788f9a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.0'

"ours" to avoid version bump.
---

1f13c2bd231886a84ef2359e4e060179ce788f9a