merge 3.2 (#12221)

diff --cc Misc/NEWS
index b85de5060c8a08ad5d03a2684388783169f17eaf,baf235c23e3a494b2550412d943ce98ecdedc7d2..b3d21f89156328a1656805ea94e0e3f883b05f7a
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -780,6 -486,6 +780,8 @@@ Tools/Demo
  Extension Modules
  -----------------
  
++- Issue #12221: Replace pyexpat.__version__ with the Python version.
++
  - Issue #12051: Fix segfault in json.dumps() while encoding highly-nested
    objects using the C accelerations.
  

diff --cc Modules/pyexpat.c
Simple merge