From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 May 2020 13:02:30 +0000 (-0400)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.5.0-alpha-dev~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d59897e58ab5c79cf7b981d05b8244a68eaf9ac;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" to avoid version bump
---

8d59897e58ab5c79cf7b981d05b8244a68eaf9ac