commit 4c049ca5d78274d5fb6706c0e55dfc401b3c4711 Merge: 42e95c8d85 01be7cc535 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 12 16:09:48 2021 -0500 Merge branch 'maint-0.4.5' "ours" to avoid version bump.