From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 Mar 2020 14:28:30 +0000 (-0400)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.5.0-alpha-dev~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c40cf41671ba7d3577216d22353f7c90e948943;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" to avoid version bump.
---

4c40cf41671ba7d3577216d22353f7c90e948943