merge 3.5 (#28932)

diff --cc Misc/NEWS
index 8fcdec5fd3695d296504530c3f077208815e4ad3,1286d7b3511a3d3b909065b0142b2a06a43a4540..cd1b6618d3755ef78a852c2e58329b81fbb1a523
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,6 -10,11 +10,8 @@@ What's New in Python 3.6.1 release cand
  Core and Builtins
  -----------------
  
 -- Issue #28147: Fix a memory leak in split-table dictionaries: setattr()
 -  must not convert combined table into split table.
 -
+ - Issue #28932: Do not include <sys/random.h> if it does not exist.
+ 
  - Issue #25677: Correct the positioning of the syntax error caret for
    indented blocks.  Based on patch by Michael Layzell.
  

diff --cc Python/random.c
Simple merge

diff --cc configure
Simple merge

diff --cc configure.ac
Simple merge

diff --cc pyconfig.h.in
Simple merge