Revert 138795 - Revert "nss: revert encrypted and origin bound certificates support."

net/base/transport_security_state_static.json

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the HSTS preloaded list in a machine readable format.
 
 // The top-level element is a dictionary with two keys: "pinsets" maps details
 // of certificate pinning to a name and "entries" contains the HSTS details for
 // each host.
 //
@@ skipping 105 matching lines @@
         "AddTrustQualifiedCARoot",
         "COMODOCertificationAuthority",
         "SecureCertificateServices",
         "TrustedCertificateServices",
         "UTNDATACorpSGC",
         "UTNUSERFirstClientAuthenticationandEmail",
         "UTNUSERFirstHardware",
         "UTNUSERFirstObject",
         "GTECyberTrustGlobalRoot"
       ]
+    },
+    {
+      "name": "tor2web",
+      "static_spki_hashes": [
+        "AlphaSSL_G2",
+        "Tor2web"
+      ]
     }
   ],
 
   "entries": [
     // Dummy entry to test certificate pinning.
     { "name": "pinningtest.appspot.com", "include_subdomains": true, "pins": "test" },
 
     // (*.)google.com, iff using SSL, must use an acceptable certificate.
     { "name": "google.com", "include_subdomains": true, "pins": "google" },
 
@@ skipping 116 matching lines @@
     { "name": "mobile.twitter.com", "include_subdomains": true, "pins": "twitterCom" },
     { "name": "dev.twitter.com", "include_subdomains": true, "pins": "twitterCom" },
     { "name": "business.twitter.com", "include_subdomains": true, "pins": "twitterCom" },
     { "name": "platform.twitter.com", "include_subdomains": true, "pins": "twitterCDN" },
     { "name": "si0.twimg.com", "include_subdomains": true, "pins": "twitterCDN" },
     { "name": "twimg0-a.akamaihd.net", "include_subdomains": true, "pins": "twitterCDN" },
     { "name": "braintreegateway.com", "include_subdomains": true, "mode": "force-https" },
     { "name": "braintreepayments.com", "mode": "force-https" },
     { "name": "www.braintreepayments.com", "mode": "force-https" },
     { "name": "emailprivacytester.com", "mode": "force-https" },
+    { "name": "tor2web.org", "include_subdomains": true, "pins": "tor2web" },
 
     // Entries that are only valid if the client supports SNI.
     { "name": "gmail.com", "mode": "force-https", "pins": "google", "snionly": true },
     { "name": "googlemail.com", "mode": "force-https", "pins": "google", "snionly": true },
     { "name": "www.gmail.com", "mode": "force-https", "pins": "google", "snionly": true },
     { "name": "www.googlemail.com", "mode": "force-https", "pins": "google", "snionly": true },
     { "name": "google-analytics.com", "include_subdomains": true, "pins": "google", "snionly": true },
     { "name": "googlegroups.com", "include_subdomains": true, "pins": "google", "snionly": true }
   ]
 }