Merge heads

diff --cc Misc/NEWS
index 1c4a4b0b0683b19a057c5244b7af539266203521,df4a024d93780c0f6cde05029dc85ca81f8af995..99e62818a87dfe9cad71f0fed1c225a0f43eaf6d
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -137,9 -137,9 +137,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #22423: Unhandled exception in thread no longer causes unhandled
 +  AttributeError when sys.stderr is None.
 +
+ - Issue #21332: Ensure that ``bufsize=1`` in subprocess.Popen() selects
+   line buffering, rather than block buffering.  Patch by Akira Li.
+ 
  - Issue #21091: Fix API bug: email.message.EmailMessage.is_attachment is now
    a method.