commit 0fb407591b8e5e028884aa6e07b7b1550bd0c703 parent 7b6be02a923075ec3966d967cca26eb8d16b645e Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 29 Jan 2020 19:42:43 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "Ours" merge to avoid version bump.