From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 19 Sep 2019 12:52:42 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.2-alpha~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e6c5b248aea3e70e78e60648b10b30daa14f0802;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'

"ours" to avoid version bump
---

e6c5b248aea3e70e78e60648b10b30daa14f0802