Merge branch 'maint-0.4.5'
commit67fdb1cd5574a974c05e48dede802eff71f8d80b
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Feb 2021 18:00:20 +0000 (15 13:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Feb 2021 18:00:20 +0000 (15 13:00 -0500)
tree8fd2449931b4e441234631443d73594e79f2ecd3
parent2ae314830428e6b5f188884c1e2f747632496b65
parent336c45f1a5b30b31cbb76a2622a6e80d755db2b5
Merge branch 'maint-0.4.5'

"ours" to avoid version bump.