merge 3.4

diff --cc Lib/ssl.py
index 37a484a0c28468b9383f1394f19dd3c69c1c4eba,ec42e38d08638c106b5325f8cfecabb12184e5a7..18730cb2e989de2623a29dd317e8e5f1861c37d9
--- 1/Lib/ssl.py
--- 2/Lib/ssl.py
+++ b/Lib/ssl.py
@@@ -122,8 -119,10 +120,9 @@@ def _import_symbols(prefix)
  _import_symbols('OP_')
  _import_symbols('ALERT_DESCRIPTION_')
  _import_symbols('SSL_ERROR_')
 -_import_symbols('PROTOCOL_')
+ _import_symbols('VERIFY_')
  
 -from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN
 +from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN
  
  from _ssl import _OPENSSL_API_VERSION
  

diff --cc Lib/test/test_ssl.py
Simple merge