From d46ec692cc38d553107e3d09fe6f8728a855e768 Mon Sep 17 00:00:00 2001
From: geemus <geemus@gmail.com>
Date: Wed, 21 Dec 2011 10:46:36 -0600
Subject: [PATCH] proxy setting should default to nil in ssl_socket

closes #97
---
 lib/excon/ssl_socket.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/excon/ssl_socket.rb b/lib/excon/ssl_socket.rb
index 08bbad1b..8321d3c2 100644
--- a/lib/excon/ssl_socket.rb
+++ b/lib/excon/ssl_socket.rb
@@ -17,7 +17,7 @@ def connect
 
     end
 
-    def initialize(params = {}, proxy = {})
+    def initialize(params = {}, proxy = nil)
       super
 
       # create ssl context