From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 30 Jan 2020 16:19:41 +0000 (-0500)
Subject: Merge branch 'maint-0.4.2'
X-Git-Tag: tor-0.4.3.2-alpha~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ee929eedbb4ca50fef3fbca9066908e8bc6e56fa;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.2'

Using "ours" strategy to avoid version bump.
---

ee929eedbb4ca50fef3fbca9066908e8bc6e56fa