From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Feb 2020 00:43:17 +0000 (-0500)
Subject: Merge branch 'maint-0.4.3'
X-Git-Tag: tor-0.4.4.0-alpha-dev~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dac185edbae6b4802e517d744891bb831e863880;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.3'

"ours" merge to avoid version bump.
---

dac185edbae6b4802e517d744891bb831e863880