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

Merge branch 'maint-0.4.2'

Use "-s ours" to avoid version bump.
---

39c5e1b84994c2f226a8530b930f215cc5ffb877