Bug 1045163: Remove delay before updating existing tables on disk (r=gcp)
Bug 1033871: Check nsIPermissionManager before enabling tracking protection in nsChannelClassifier (r=mcmanus)

--HG--
rename : toolkit/components/url-classifier/tests/mochitest/classifiedAnnotatedFrame.html => toolkit/components/url-classifier/tests/mochitest/allowlistAnnotatedFrame.html
rename : toolkit/components/url-classifier/tests/mochitest/test_classified_annotations.html => toolkit/components/url-classifier/tests/mochitest/test_allowlisted_annotations.html