 +#else
 +#define NOCFI
 +#endif
-+#endif  // GOSTSSL
++#endif // GOSTSSL
 +
  int SSLClientSocketImpl::Connect(CompletionOnceCallback callback) {
    // Although StreamSocket does allow calling Connect() after Disconnect(),

 CHANNEL=@@CHANNEL@@
 case $CHANNEL in
   stable )
diff --git a/net/base/net_error_list.h b/net/base/net_error_list.h
index 9614b3d857d1..55601225fc52 100644
--- a/net/base/net_error_list.h

 net/ssl/client_cert_store_nss.cc              |  53 ++++++
 net/ssl/openssl_ssl_util.cc                   |   4 +
 net/ssl/ssl_cipher_suite_names.cc             |  26 +++
 net/ssl/ssl_platform_key_util.cc              |  21 +++
 net/ssl/ssl_platform_key_util.h               |   7 +
 17 files changed, 529 insertions(+), 5 deletions(-)

diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index be0c8603874a..6e5d957855f7 100644
