From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Dec 2019 18:30:32 +0000 (-0500)
Subject: Merge branch 'maint-0.3.5' into maint-0.4.0
X-Git-Tag: tor-0.4.0.6~4^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=371d7dbc1a1c8e4cacd80641066d01ba54be197e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.
---

371d7dbc1a1c8e4cacd80641066d01ba54be197e