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

commit 00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c Merge: 825f52784 6d81ca845 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 15 08:06:36 2019 -0500 Merge branch 'maint-0.4.2' "ours" to avoid version bump.