commit def7844c4f636c51bed5d79f922a974521f68553 Merge: 6b71cc64c 9e85515f8 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.4'