From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 24 Oct 2019 00:26:15 +0000 (-0400)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.1-alpha~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a03c0394a3f6885cd10f1c1d7e93834b39ab8fde;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.
---

a03c0394a3f6885cd10f1c1d7e93834b39ab8fde