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

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.
---

68e1ced607eaed3105b4b3967e2f6af5070da0e4