merge 3.3 (#17328)

diff --cc Misc/NEWS
index 2f24d0b8917b6334c22dfc9aa1e2c855d5ed0b47,958cc1a7d45ea65366917ca8b7a1f09258e5057b..80d139a279e4240cfcfd8b3f020337cb09371ec9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -12,8 +10,11 @@@ What's New in Python 3.4.0 Alpha 1
  Core and Builtins
  -----------------
  
 +- Issue #17032: The "global" in the "NameError: global name 'x' is not defined"
 +  error message has been removed.  Patch by Ram Rachum.
 +
+ - Issue #17328: Fix possible refleak in dict.setdefault.
+ 
  - Issue #17223: array module: Fix a crasher when converting an array containing
    invalid characters (outside range [U+0000; U+10ffff]) to Unicode:
    repr(array), str(array) and array.tounicode(). Patch written by Manuel Jacob.

diff --cc Objects/dictobject.c
Simple merge