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

[nickm at torproject.org]

commit 70415c9f729847a56e7feefe75e77b2cb96d4667
Merge: 91c7d395c 4ecd09cfb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 19 14:29:22 2019 -0400

    Merge branch 'maint-0.4.1'
    
    "ours" merge to avoid taking pracktracker removal.