commit 5b47a58d1697462b83299d1ab0b7192e9dae6e35 Merge: def7844c4 b2ce815bd Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 29 13:56:16 2020 -0400 Merge branch 'maint-0.4.4'