merge 3.3 (#19220)

diff --cc Modules/unicodedata.c
index 5530c7aea9faec718e3d9a681779c2d56814baff,10d60e3cb75c0fdab5810d73f0ce8a3b1041e21b..59bfb343578aed59a3d7267c4a2260d5a42fc51d
--- 1/Modules/unicodedata.c
--- 2/Modules/unicodedata.c
+++ b/Modules/unicodedata.c
@@@ -1322,12 -1322,11 +1322,10 @@@ PyDoc_STRVAR(unicodedata_docstring
  "This module provides access to the Unicode Character Database which\n\
  defines character properties for all Unicode characters. The data in\n\
  this database is based on the UnicodeData.txt file version\n\
 -6.0.0 which is publically available from ftp://ftp.unicode.org/.\n\
 +6.3.0 which is publically available from ftp://ftp.unicode.org/.\n\
  \n\
  The module uses the same names and symbols as defined by the\n\
- UnicodeData File Format 6.3.0 (see\n\
- http://www.unicode.org/reports/tr44/tr44-6.html).");
 -UnicodeData File Format 6.0.0.");
--
++UnicodeData File Format 6.3.0");
  
  static struct PyModuleDef unicodedatamodule = {
          PyModuleDef_HEAD_INIT,