commit d124cfc0584883d55cb00f975a170d2b68bf7281 Merge: 31bdfd492 a692b87f8 Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 29 13:55:22 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3