Merge pull request #38 from jack230230/master

Add Faraday timeout support.

Author: Tom Milewski

lib/omniauth/strategies/oauth2.rb

@@ -80,7 +80,7 @@ def callback_phase
         fail!(:invalid_credentials, e)
       rescue ::MultiJson::DecodeError => e
         fail!(:invalid_response, e)
-      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+      rescue ::Timeout::Error, ::Errno::ETIMEDOUT, Faraday::Error::TimeoutError => e
         fail!(:timeout, e)
       rescue ::SocketError => e
         fail!(:failed_to_connect, e)