Commit 6fff643a authored Jan 22, 2021 by Nick Mathewson

Merge branch 'maint-0.4.5'

"-s ours" to avoid version bump.

There are no changes