Merge branch 'maint-0.4.5'
commitd31beeef9f5ce1e00079a106c60fc22b0451f5b9
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Jan 2021 17:48:11 +0000 (11 12:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Jan 2021 17:48:11 +0000 (11 12:48 -0500)
treeaf21ef53a68c5c739139fd63bcafd72b85f2fd7d
parentee0a27293e0b5a402a09e85f67483829731480af
parentedc9fda4f5ba6f1d04ec239e77aca273f8c6701b
Merge branch 'maint-0.4.5'

"ours" to avoid version bump.