From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Mar 2021 13:18:40 +0000 (-0400)
Subject: Merge branch 'maint-0.4.5'
X-Git-Tag: tor-0.4.6.1-alpha~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36b54fc6aa5f6ac0a765e9e3355ec5310a23233d;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.5'

"ours" to avoid version bump.
---

36b54fc6aa5f6ac0a765e9e3355ec5310a23233d