commit da59dee5d4d791ad46d3b3d69bcd880c1a5335bb Merge: 8d7015eb8 e5b9eefb0 Author: Nick Mathewson <nickm at torproject.org> Date: Tue Oct 22 12:10:30 2019 -0400 Merge branch 'maint-0.4.2'