Issue #14132, Issue #17214: Merge two redirect handling fixes from 3.5

diff --cc Lib/urllib/request.py
Simple merge

diff --cc Misc/NEWS
index fe75bf9ada7bbe32c260cd7c60e5b4a52594c04f,0b9f6f0755cfe4175225eece4a15f6ca915e51c3..33dedeb87e12bf1ea119658a7eeb7e05b58196f9
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -277,18 -117,16 +277,27 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #14132: Fix urllib.request redirect handling when the target only has
+   a query string.  Original fix by Ján Janech.
+ 
+ - Issue #17214: The "urllib.request" module now percent-encodes non-ASCII
+   bytes found in redirect target URLs.  Some servers send Location header
+   fields with non-ASCII bytes, but "http.client" requires the request target
+   to be ASCII-encodable, otherwise a UnicodeEncodeError is raised.  Based on
+   patch by Christian Heimes.
+ 
 +- Issue #27033: The default value of the decode_data parameter for
 +  smtpd.SMTPChannel and smtpd.SMTPServer constructors is changed to False.
 +
 +- Issue #27034: Removed deprecated class asynchat.fifo.
 +
 +- Issue #26870: Added readline.set_auto_history(), which can stop entries
 +  being automatically added to the history list.  Based on patch by Tyler
 +  Crompton.
 +
 +- Issue #26039: zipfile.ZipFile.open() can now be used to write data into a ZIP
 +  file, as well as for extracting data.  Patch by Thomas Kluyver.
 +
  - Issue #26892: Honor debuglevel flag in urllib.request.HTTPHandler. Patch
    contributed by Chi Hsuan Yen.