commit cb69a5a1184e1b02523308c6d51b0f8f715f064e parent efdbf42432b325ef5638a1f005cd77c6b4645d20 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 18 Mar 2020 12:16:59 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump.