commit 7c88fcf4e2ed04af07fed9438b59764f1b4adab0 Merge: 7d75e1dbd 5ddc04f49 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:53:12 2019 -0400 Merge branch 'maint-0.4.2'