Merge mozilla-central to inbound. a=merge CLOSED TREE

This commit is contained in:
Margareta Eliza Balazs
2018-04-04 12:51:48 +03:00
133 changed files with 3596 additions and 2369 deletions

View File

@@ -5391,8 +5391,8 @@ pref("network.trr.confirmationNS", "example.com");
// hardcode the resolution of the hostname in network.trr.uri instead of
// relying on the system resolver to do it for you
pref("network.trr.bootstrapAddress", "");
// TRR blacklist entry expire time (in seconds). Default is 72 hours.
pref("network.trr.blacklist-duration", 259200);
// TRR blacklist entry expire time (in seconds). Default is 20 minutes.
pref("network.trr.blacklist-duration", 1200);
// Single TRR request timeout, in milliseconds
pref("network.trr.request-timeout", 3000);
// Allow AAAA entries to be used "early", before the A results are in