Merge with 3.4 (closes #23280)

diff --cc Modules/clinic/binascii.c.h
index 6147be917958c0d54b64e8054821df81be6be559,f647032ada846e810102c3697c562acbe7d16ab3..b2b6e6b4faf285a18d74c47792aa53ed78fea83f
--- 1/Modules/clinic/binascii.c.h
--- 2/Modules/clinic/binascii.c.h
+++ b/Modules/clinic/binascii.c.h
@@@ -475,4 -543,4 +543,4 @@@ exit
  
      return return_value;
  }
- /*[clinic end generated code: output=53cd6b379c745220 input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=e46d29f8c9adae7e input=a9049054013a1b77]*/
++/*[clinic end generated code: output=771126f8f53e84e7 input=a9049054013a1b77]*/