commit eef77227efce958382e3b221d86e6dba3b4a058a Merge: d124cfc05 d235e523d Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 29 13:57:41 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3