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

Merge branch 'maint-0.4.3'

"ours" to avoid version bump
---

11fbd1f064751e38ccd79e7823adb688b1293e59