From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 Jun 2021 17:31:21 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5' into maint-0.4.6
X-Git-Tag: tor-0.4.6.5~12^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66701c61951a13534b3e802e478270a5f04dbd15;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5' into maint-0.4.6

"ours" to avoid version bump.
---

66701c61951a13534b3e802e478270a5f04dbd15