commit 1b58399b07a17c2745624f35780fd3ddbe7a0251 Merge: 986730e82c 421ce94395 Author: David Goulet <dgoulet at torproject.org> Date: Mon Jan 24 10:49:32 2022 -0500 Merge branch 'maint-0.3.5' into maint-0.4.5