Issue #29092: Merge 3.6.

diff --cc Modules/clinic/posixmodule.c.h
index c88716f11116d8968d275a0f23226c458e5118e3,0d3ce6eed65d260980a5af7f7c1ca4270c2cf045..39ac7fd54fd90ed4df55cbe15f3bed7f4b8bd7b7
--- 1/Modules/clinic/posixmodule.c.h
--- 2/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@@ -6492,4 -6150,4 +6493,4 @@@ exit
  #ifndef OS_GETRANDOM_METHODDEF
      #define OS_GETRANDOM_METHODDEF
  #endif /* !defined(OS_GETRANDOM_METHODDEF) */
- /*[clinic end generated code: output=30cdd28fc524f2fb input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=455def991740915a input=a9049054013a1b77]*/
++/*[clinic end generated code: output=5a0be969e3f71660 input=a9049054013a1b77]*/

diff --cc Modules/posixmodule.c
Simple merge