From: Yury Selivanov <yury@magic.io>
Date: Mon, 12 Sep 2016 01:44:17 +0000 (-0400)
Subject: Merge 3.5 (issue #27456)
X-Git-Tag: v3.6.0b1~17^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=503ba3ed973d8e82ea5e38cb287d4127fccf51b8;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (issue #27456)
---

503ba3ed973d8e82ea5e38cb287d4127fccf51b8
diff --cc Misc/NEWS
index 8a28aad57c01,73286b7eab69..a7e648bdcdfc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -363,8 -254,8 +363,10 @@@ Librar
  - Issue #21201: Improves readability of multiprocessing error message.  Thanks
    to Wojciech Walczak for patch.
  
 +- asyncio: Add set_protocol / get_protocol to Transports.
 +
+ - Issue #27456: asyncio: Set TCP_NODELAY by default.
+ 
  IDLE
  ----