commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8 parent c7ca3fc1869f4999845526d7fd883e17630143e9 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 9 Dec 2019 16:01:22 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.