Merge fix for #8933 from 3.2

diff --cc Misc/NEWS
index 84b6be3151a8e869737677d73f78ed5428979bd6,12ac26eb24589c6c015d336d2b64f7d836a48254..67b8cf85a1999a1ba6d4d7edb6d1d1417b7a0daa
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -274,12 -80,6 +274,16 @@@ Core and Builtin
  Library
  -------
  
++- Issue #8933: distutils' PKG-INFO files will now correctly report
++  Metadata-Version: 1.1 instead of 1.0 if a Classifier or Download-URL field is
++  present.
++
 +- Issue #12567: Add curses.unget_wch() function. Push a character so the next
 +  get_wch() will return it.
 +
 +- Issue #9561: distutils and packaging now writes egg-info files using UTF-8,
 +  instead of the locale encoding.
 +
  - Issue #8286: The distutils command sdist will print a warning message instead
    of crashing when an invalid path is given in the manifest template.