From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 May 2020 14:38:18 +0000 (-0400)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.5.0-alpha-dev~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbd384cf893bb675157fa754014ec63ffa2f5d61;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" to avoid 0.4.3.5 version bump.
---

fbd384cf893bb675157fa754014ec63ffa2f5d61