Merge 3.5 (asyncio)

diff --cc Lib/asyncio/base_events.py
Simple merge

diff --cc Lib/asyncio/proactor_events.py
Simple merge

diff --cc Lib/asyncio/selector_events.py
Simple merge

diff --cc Lib/asyncio/sslproto.py
Simple merge

diff --cc Lib/asyncio/unix_events.py
Simple merge