commit 7a9e2a261b44b93e244c04593dee8f7757ba32bc parent 7f0ad3343e2139f368f896ca44f8a9d9d84e6346 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 13 Mar 2020 16:56:44 -0400 Merge branch 'maint-0.3.5' into maint-0.4.1 "ours" to avoid version bump.