timeout issue

Rebase for https://github.com/square/okhttp/pull/375