commit d925d2995c6b11e4fea3a0637544c23b0b90ff95 parent 84f57b69f31bf47cbc902d853040cb099256ec6d Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 18 Mar 2020 12:17:20 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3 "ours" to avoid version bump.