From 654870a185dd41bd8b526823e4688757a50c5f1e Mon Sep 17 00:00:00 2001
From: Lukasz Jastrzebski <lukasz.jastrzebski@gmail.com>
Date: Sun, 9 Feb 2014 16:27:32 -0800
Subject: [PATCH] Fixing ssh_config proxy_command is not included

---
 plugins/commands/ssh_config/command.rb   | 3 ++-
 templates/commands/ssh_config/config.erb | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/commands/ssh_config/command.rb b/plugins/commands/ssh_config/command.rb
index 7ebae73fd..eb10190e4 100644
--- a/plugins/commands/ssh_config/command.rb
+++ b/plugins/commands/ssh_config/command.rb
@@ -37,7 +37,8 @@ module VagrantPlugins
             :ssh_user => ssh_info[:username],
             :private_key_path => ssh_info[:private_key_path],
             :forward_agent => ssh_info[:forward_agent],
-            :forward_x11   => ssh_info[:forward_x11]
+            :forward_x11   => ssh_info[:forward_x11],
+            :proxy_command => ssh_info[:proxy_command]
           }
 
           # Render the template and output directly to STDOUT
diff --git a/templates/commands/ssh_config/config.erb b/templates/commands/ssh_config/config.erb
index c3eb1d6fc..2cdb2dbf4 100644
--- a/templates/commands/ssh_config/config.erb
+++ b/templates/commands/ssh_config/config.erb
@@ -20,3 +20,6 @@ Host <%= host_key %>
 <% if forward_x11 -%>
   ForwardX11 yes
 <% end -%>
+<% if proxy_command -%>
+  ProxyCommand <%= proxy_command %>
+<% end -%>