commit 6fff643a83a3899f676c4a3479ac898dd5790133 Merge: 74cfe3611f 5eef63aa71 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 22 09:49:24 2021 -0500

Merge branch 'maint-0.4.5'

"-s ours" to avoid version bump.