commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e parent 92fb0990675424cd04eb0b39b4ae157ac7f5385b Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 5 Dec 2019 13:30:32 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.