From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Nov 2019 21:39:44 +0000 (-0500)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~152
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd4ae97448ea503111d6f235624a4594f7ff3470;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.
---

cd4ae97448ea503111d6f235624a4594f7ff3470