commit f8df0f5f32a1deaeb329ad78f05d209173c5f458 parent bb786797aa449389d47f7bf94fb5fa238e51e377 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 5 Dec 2019 13:32:06 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.