commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5 parent 3248630fc81b24b22e337fab70d67c966b059356 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 9 Dec 2019 16:03:01 -0500 Merge branch 'maint-0.4.1' into maint-0.4.2 "ours" to avoid version bump.