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

Merge branch 'maint-0.4.5' into maint-0.4.6

"Ours" to avoid version bump.
---

e04e545173028aa6c16a55388e2057dbb6f5aa1f