merge 3.3 (#17228)

diff --cc Misc/NEWS
index ac29b186c7a9fb1fe81c359ff0d429f467bc1b12,1d4969da2b6554eca083f42e2352064a9d5c3977..8d935c66e5ca02bdb108d1ab039edf86c6304e44
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -940,12 -689,10 +940,14 @@@ Test
  Build
  -----
  
+ - Issue #17228: Fix building without pymalloc.
+ 
  - Issue #3718: Use AC_ARG_VAR to set MACHDEP in configure.ac.
  
 +- Issue #16235: Implement python-config as a shell script.
 +
 +- Issue #16769: Remove outdated Visual Studio projects.
 +
  - Issue #17031: Fix running regen in cross builds.
  
  - Issue #3754: fix typo in pthread AC_CACHE_VAL.

diff --cc Objects/obmalloc.c
Simple merge