From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 18 Mar 2020 16:17:32 +0000 (-0400)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.5.0-alpha-dev~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b307664512ed695108a3bf890ec3d14baa86b1f;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" to avoid version bump.
---

9b307664512ed695108a3bf890ec3d14baa86b1f