merge 3.3 (#20246)
diff --git a/Misc/ACKS b/Misc/ACKS
index ed5afe7..e2f990e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1218,6 +1218,7 @@
Gregory P. Smith
Mark Smith
Roy Smith
+Ryan Smith-Roberts
Rafal Smotrzyk
Eric Snow
Dirk Soede
diff --git a/Misc/NEWS b/Misc/NEWS
index a6c5090..6c8cacd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,8 @@
- Issue #20242: Fixed basicConfig() format strings for the alternative
formatting styles. Thanks to kespindler for the bug report and patch.
+- Issue #20246: Fix buffer overflow in socket.recvfrom_into.
+
- Issues #20206 and #5803: Fix edge case in email.quoprimime.encode where it
truncated lines ending in a character needing encoding but no newline by
using a more efficient algorithm that doesn't have the bug.