tree 8c72ee123c4eeacaab10b5001071a7aa5e880168
parent a4950d875a6d42a910cbbe0e3f9aca2dea206106
parent 808d6416e37bac2d8aa3ebe869f459d39e46cf0c
author Victor Stinner <victor.stinner@gmail.com> 1442819057 +0200
committer Victor Stinner <victor.stinner@gmail.com> 1442819057 +0200
HG:extra amend_source:83b2f36f7623f982541567a07ef5285c0c1debe8

Merge 3.4 (test_socket, issue #25138)