commit 31bdfd4920849a38c7bd2ed2d8ef1b8645c65790 Merge: f862971d0 0575a182a Author: Nick Mathewson <nickm at torproject.org> Date: Mon Jun 29 13:48:32 2020 -0400 Merge branch 'maint-0.4.2' into maint-0.4.3