merge 3.5 (closes #24806)

diff --cc Misc/NEWS
index 074577f803734deb63a3bd3ac120d95a08810aca,de56df22e9ead69d3f28833d2feaad0bdc7f9a17..4209f079c4daef43bf6e7361744405a5bc22bcd5
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,15 -11,11 +10,18 @@@ Release date: XXXX-XX-X
  Core and Builtins
  -----------------
  
+ - Issue #24806: Prevent builtin types that are not allowed to be subclassed from
+   being subclassed through multiple inheritance.
+ 
 +* Issue #25301: The UTF-8 decoder is now up to 15 times as fast for error
 +  handlers: ``ignore``, ``replace`` and ``surrogateescape``.
 +
  - Issue #24848: Fixed a number of bugs in UTF-7 decoding of misformed data.
  
 +- Issue #25267: The UTF-8 encoder is now up to 75 times as fast for error
 +  handlers: ``ignore``, ``replace``, ``surrogateescape``, ``surrogatepass``.
 +  Patch co-written with Serhiy Storchaka.
 +
  - Issue #25280: Import trace messages emitted in verbose (-v) mode are no
    longer formatted twice.
  

diff --cc Objects/typeobject.c
Simple merge