From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Mar 2020 16:16:59 +0000 (-0400)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.1
X-Git-Tag: tor-0.4.2.8~30^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb69a5a1184e1b02523308c6d51b0f8f715f064e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.1

"ours" to avoid version bump.
---

cb69a5a1184e1b02523308c6d51b0f8f715f064e