Merge branch 'maint-0.4.5'
commit36b54fc6aa5f6ac0a765e9e3355ec5310a23233d
authorNick Mathewson <nickm@torproject.org>
Tue, 16 Mar 2021 13:18:40 +0000 (16 09:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 16 Mar 2021 13:18:40 +0000 (16 09:18 -0400)
tree9630ed2127bfc182ac548513376ec8f8e575ea63
parent57d969de1ae167815da66168147ffff92c0c38eb
parentd66178c7b7eb69b5b6fc26a77b13354725eaa1a3
Merge branch 'maint-0.4.5'

"ours" to avoid version bump.