From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 30 Oct 2013 16:50:18 +0000 (-0400)
Subject: merge 3.2 (#19435)
X-Git-Tag: v3.4.0b1~470^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a50f89954d206e063d653b847a4b5bbc8c0abb8c;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#19435)
---

a50f89954d206e063d653b847a4b5bbc8c0abb8c
diff --cc Misc/NEWS
index e83016719309,e8054cf20290..5bcf60d6e707
--- a/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
  -----------------