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