merge 3.5 (#24557)

diff --cc Modules/_ssl.c
Simple merge

diff --cc Modules/clinic/_ssl.c.h
index 2bf46b5c1bdd2e45a4a8dafd7dff200e024e66f9,9cbcc28955363d0517ee01d110f9d7b3df430256..1d9f91d58d9510ee461ceed3eee91cebd76b997e
--- 1/Modules/clinic/_ssl.c.h
--- 2/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@@ -1135,4 -1102,4 +1135,4 @@@ exit
  #ifndef _SSL_ENUM_CRLS_METHODDEF
      #define _SSL_ENUM_CRLS_METHODDEF
  #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
- /*[clinic end generated code: output=c6fe203099a5aa89 input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=abe795f14cb63b6a input=a9049054013a1b77]*/
++/*[clinic end generated code: output=df99659ec790e573 input=a9049054013a1b77]*/

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc pyconfig.h.in
Simple merge