From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 13 Apr 2020 21:02:38 +0000 (-0400)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.5.0-alpha-dev~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=202a57e45834a4a3a6c551b96b801b3ef1af1954;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" to avoid version bump.
---

202a57e45834a4a3a6c551b96b801b3ef1af1954