commit d66005ada79a69936e3e0a4bc6a420f85d84373c Merge: 4bb06cae2 bb3df5f32 Author: teor <teor@torproject.org> Date: Fri Mar 20 17:33:56 2020 +1000 Merge branch 'ticket33678_043' into ticket33678_master Don't take the practracker disable changes from 0.4.3.