commit 4d43e1bf4f75cac55a2a6a6fdc827c94b20c7f3b Merge: f58439ee5 9537966a0 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:15:14 2019 -0400 Merge branch 'maint-0.4.2'