Merge from 3.5.

diff --cc .hgtags
index f15d62a86972291ff8c9b9b2ade7b0407c0c56b1,ed4fc925982fe71c90b472b04164812848587b68..b7a7ea4869c1b63077a8dd6a0812f0ce51632f70
--- 1/.hgtags
--- 2/.hgtags
+++ b/.hgtags
@@@ -147,6 -147,7 +147,8 @@@ b4cbecbc0781e89a309d03b60a1f75f8499250e
  04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
  737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
  3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
+ 619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
++3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
  5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
  0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
  82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
@@@ -163,5 -164,4 +165,6 @@@ cc15d736d860303b9da90d43cd32db39bab048d
  948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1
  37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1
  68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
+ 4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2
 +5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1
 +37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2

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