[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

commit a03c0394a3f6885cd10f1c1d7e93834b39ab8fde Merge: 20606b8a1 76939cf29 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Oct 23 20:26:15 2019 -0400 Merge branch 'maint-0.4.2' "ours" to avoid version bump.