summaryrefslogtreecommitdiffstats
path: root/Doc/whatsnew
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2017-01-23 11:34:00 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2017-01-23 11:34:00 (GMT)
commit0e830455cbf5dc537b3d1bc1a513c5ba669390ae (patch)
treea53ab7ed4539414422607052e7614645b6510ca9 /Doc/whatsnew
parentccb5f3cee9ebb5f20e33f31432a46579f8e9bf8e (diff)
parent01f5ae7b76236a19c670d107b06b68ccb69f532f (diff)
downloadcpython-0e830455cbf5dc537b3d1bc1a513c5ba669390ae.zip
cpython-0e830455cbf5dc537b3d1bc1a513c5ba669390ae.tar.gz
cpython-0e830455cbf5dc537b3d1bc1a513c5ba669390ae.tar.bz2
Merge 3.6
Diffstat (limited to 'Doc/whatsnew')
-rw-r--r--Doc/whatsnew/3.6.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index f6c71d3..96fd256 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1371,6 +1371,9 @@ The socket module now supports the address family
(Contributed by Christian Heimes in :issue:`27744` with support from
Victor Stinner.)
+New Linux constants ``TCP_USER_TIMEOUT`` and ``TCP_CONGESTION`` were added.
+(Contributed by Omar Sandoval, issue:`26273`).
+
socketserver
------------