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

commit 3b6bd768d374340e667b42fad07a51094abb38a7 Merge: 70415c9f7 aab5f42ae Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 24 09:32:54 2019 -0400 Merge branch 'maint-0.4.1' "ours" to avoid version bump.