commit 3939bb82f0f222550385dd583355f57e7ec6f9ea Merge: da59dee5d 34f3d8d40 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:11:59 2019 -0400 Merge branch 'maint-0.4.2'