MERGE: Solved a potential deadlock in test_telnetlib.py. Related to issue #11812
diff --git a/Misc/NEWS b/Misc/NEWS
index 1a226a5..4548d50 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1616,6 +1616,8 @@
- Skip network tests when getaddrinfo() returns EAI_AGAIN, meaning a temporary
failure in name resolution.
+- Solved a potential deadlock in test_telnetlib.py. Related to issue #11812.
+
- Avoid failing in test_robotparser when mueblesmoraleda.com is flaky and
an overzealous DNS service (e.g. OpenDNS) redirects to a placeholder
Web site.