  net/ssl/client_cert_store_nss.cc                   |  46 ++++++++
  net/ssl/openssl_ssl_util.cc                        |   4 +
  net/ssl/ssl_cipher_suite_names.cc                  |  22 ++++
- 11 files changed, 285 insertions(+), 6 deletions(-)
+ 12 files changed, 286 insertions(+), 7 deletions(-)
 
 diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
 index 0830efb..2787539 100644

 .../common/chromium-browser/chromium-browser.info  |  10 +-
 chrome/installer/linux/common/installer.include    |   3 +
 chrome/installer/linux/rpm/chrome.spec.template    |   4 +
 net/base/net_error_list.h                          |   6 +
 net/cert/cert_verify_proc.cc                       |  56 +++++++++
 net/http/http_network_transaction.cc               |   8 ++

 CHANNEL=@@CHANNEL@@
 case $CHANNEL in
   stable )
diff --git a/components/ssl_config/ssl_config_service_manager_pref.cc b/components/ssl_config/ssl_config_service_manager_pref.cc
index ee63047..e389cdf 100644
--- a/components/ssl_config/ssl_config_service_manager_pref.cc
+++ b/components/ssl_config/ssl_config_service_manager_pref.cc
@@ -243,7 +243,7 @@ void SSLConfigServiceManagerPref::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(ssl_config::prefs::kCertEnableSha1LocalAnchors,
                                 false);
   registry->RegisterBooleanPref(
-      ssl_config::prefs::kCertEnableCommonNameFallbackLocalAnchors, false);
+      ssl_config::prefs::kCertEnableCommonNameFallbackLocalAnchors, true);
   registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMin,
                                std::string());
   registry->RegisterStringPref(ssl_config::prefs::kSSLVersionMax,
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h
index 617a56d..f5007d5 100644
--- a/net/base/net_error_list.h
