commit 215a6debba8c047bea25ec29d6a3339286a36b4e
Merge: 61fe3f448 a4790e7d4
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Oct 11 17:20:54 2019 -0400
Merge branch 'maint-0.4.2'
"Ours" merge to avoid takign ".enable_practracker_in_hooks"