diff -r 6d69da76be6a Doc/library/socket.rst --- a/Doc/library/socket.rst Tue Nov 29 16:55:04 2016 +0100 +++ b/Doc/library/socket.rst Tue Nov 29 18:25:16 2016 +0100 @@ -300,8 +300,8 @@ Constants provided. .. versionchanged:: 3.6 - ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC`` - were added. + ``SO_DOMAIN``, ``SO_PROTOCOL``, ``SO_PEERSEC``, ``SO_PASSSEC``, + ``TCP_USER_TIMEOUT``, ``TCP_CONGESTION`` were added. .. data:: AF_CAN PF_CAN diff -r 6d69da76be6a Doc/whatsnew/3.6.rst --- a/Doc/whatsnew/3.6.rst Tue Nov 29 16:55:04 2016 +0100 +++ b/Doc/whatsnew/3.6.rst Tue Nov 29 18:25:16 2016 +0100 @@ -1346,6 +1346,9 @@ The socket module now supports the addre (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 ------------ diff -r 6d69da76be6a Misc/NEWS --- a/Misc/NEWS Tue Nov 29 16:55:04 2016 +0100 +++ b/Misc/NEWS Tue Nov 29 18:25:16 2016 +0100 @@ -21,6 +21,10 @@ Core and Builtins Library ------- +- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and + :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by + Omar Sandoval. + - Issue #24142: Reading a corrupt config file left configparser in an invalid state. Original patch by Florian Höch. @@ -74,10 +78,6 @@ Core and Builtins Library ------- -- Issue #26273: Add new :data:`socket.TCP_CONGESTION` (Linux 2.6.13) and - :data:`socket.TCP_USER_TIMEOUT` (Linux 2.6.37) constants. Patch written by - Omar Sandoval. - - Issue #28752: Restored the __reduce__() methods of datetime objects. - Issue #28727: Regular expression patterns, _sre.SRE_Pattern objects created