commit e2a42a1ab0bbea00e24718f0ff3b9c6538aaa802 Merge: 1697019d5 fbd2fef22 Author: Nick Mathewson <nickm at torproject.org> Date: Fri Oct 18 12:27:12 2019 -0400 Merge branch 'maint-0.4.2'