]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b55f8b7 fab75d9)
Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4
authorMartin Panter <vadmium+py@gmail.com>
Fri, 15 Jan 2016 02:18:31 +0000 (02:18 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Fri, 15 Jan 2016 02:18:31 +0000 (02:18 +0000)
1  2 
Lib/test/test_ssl.py patch | diff1 | diff2 | blob | history

diff --cc Lib/test/test_ssl.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.