Merge branch 'hg'

Author: jakub-horak

src/tests/cli/t_https.py

@@ -450,10 +450,10 @@ def test_tls_version(version):
 
         # Anything below TLS 1.2 is not allowed.
         self.assertRaisesRegex(ssl.SSLError,
-                               r"ALERT_PROTOCOL_VERSION|NO_CIPHERS_AVAILABLE",
+                               r"NO_PROTOCOLS_AVAILABLE",
                                test_tls_version, ssl.TLSVersion.TLSv1_1)
         self.assertRaisesRegex(ssl.SSLError,
-                               r"ALERT_PROTOCOL_VERSION|NO_CIPHERS_AVAILABLE",
+                               r"NO_PROTOCOLS_AVAILABLE",
                                test_tls_version, ssl.TLSVersion.TLSv1)
         self.assertRaisesRegex(ssl.SSLError,
                                r"NO_PROTOCOLS_AVAILABLE",