Merge heads

diff --cc Misc/NEWS
index 956721a756ad1b6eb50ae00b57406fd686065866,9e4c55ed43b9563df735bbc6088306817230bd66..922999ffc713e02679b9df39d396eb5e564b572d
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -32,9 -32,9 +32,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.  Since EmailMessage is provisional, we can change the API in a
    maintenance release, but we use a trick to remain backward compatible with