merge 3.2 (#19435)

diff --cc Lib/http/server.py
Simple merge

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

diff --cc Misc/NEWS
index e83016719309e7320e366f6e9ee6480fded9ed58,e8054cf2029044a57d8b74e96e930fe5058c5ef1..5bcf60d6e7078d24a1e63ff9fc1bc40ee83f0029
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -13,12 -69,13 +13,13 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
++- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler.
  
  
 -What's New in Python 3.2.4 release candidate 1?
 +What's New in Python 3.3.3 release candidate 1?
  ===============================================
  
 -*Release date: 24-Mar-2013*
 +*Release date: 27-Oct-2013*
  
  Core and Builtins
  -----------------