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

[nickm at torproject.org]

commit 1e230bd48835fd5587f3b45f1b5fe1891281a267
Merge: 354f085e5 fc16dbf7a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 9 15:47:44 2020 -0400

    Merge branch 'maint-0.4.4'
    
    ("Ours" to avoid removal of .enable_practracker_in_hooks)