commit f58439ee55512d8deb29272b0beadad43036c7fe Merge: 3939bb82f c55c75bc9 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:13:56 2019 -0400 Merge branch 'maint-0.4.2'