commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25 parent 641dce2d6bfe382411d5897003b18167fdddfc2b Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 28 Jan 2021 11:17:43 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.
