commit 8d7015eb8b9087006fb627d31071caa21a654d49 Merge: 2d013bbe5 cbc67241d Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:08:53 2019 -0400 Merge branch 'maint-0.4.2'