commit db1065403ddabacd7c67273bff30f027151fb142 parent cfa9cc34aa36c0f300724a01998633efbe8439ea Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 5 Dec 2019 13:31:17 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1 "ours" to avoid version bump.