From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 3 Feb 2021 18:39:41 +0000 (-0500)
Subject: Merge branch 'maint-0.4.4' into maint-0.4.5
X-Git-Tag: tor-0.4.5.6~20^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff1b24fb73cb8b32fdf4d4121ed958286ae1dab2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.4' into maint-0.4.5

"ours" to avoid version bump.
---

ff1b24fb73cb8b32fdf4d4121ed958286ae1dab2