merge 3.3 (#24044)

diff --cc Misc/NEWS
index 3d2e09f1bd73edb58348c118aaa69fb311acff0b,1a313db82c9d09429b83190172dd11cf694ba17f..85e55d06a0764c2c39ad8bc7e7e97bcfea28c634
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,24 -10,12 +10,27 @@@ Release date: tb
  Core and Builtins
  -----------------
  
 -- Issue #23055: Fixed a buffer overflow in PyUnicode_FromFormatV.  Analysis
 -  and fix by Guido Vranken.
 -
 +- Issue #24022: Fix tokenizer crash when processing undecodable source code.
 +
 +- Issue #23309: Avoid a deadlock at shutdown if a daemon thread is aborted
 +  while it is holding a lock to a buffered I/O object, and the main thread
 +  tries to use the same I/O object (typically stdout or stderr).  A fatal
 +  error is emitted instead.
 +
 +- Issue #22977: Fixed formatting Windows error messages on Wine.
 +  Patch by Martin Panter.
 +
 +- Issue #23803: Fixed str.partition() and str.rpartition() when a separator
 +  is wider then partitioned string.
 +
 +- Issue #23192: Fixed generator lambdas.  Patch by Bruno Cauet.
 +
 +- Issue #23629: Fix the default __sizeof__ implementation for variable-sized
 +  objects.
 +
+ - Issue #24044: Fix possible null pointer dereference in list.sort in out of
+   memory conditions.
+ 
  Library
  -------
  

diff --cc Objects/listobject.c
Simple merge