commit 1fa90a2077af46ba27c34cb45b962e5e48931284 parent 3d3dc08ed8782e88f1e87a9550b9f18751c5732a Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 12 Nov 2020 08:11:20 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 "ours" to avoid version bump.