commit 3d3dc08ed8782e88f1e87a9550b9f18751c5732a parent 6338c35e9d789cd77393a1f1e129892e328ae809 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 9 Nov 2020 17:13:25 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "-s ours" to avoid version bump.