# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1329145601 -7200
# Node ID d1a4574fa53407b05f46ddff3280364b6a48125f
# Parent  8354ab3a704223653d9bcb7fa06a0edb4e9a183f
This option was disabled to simplify use of port forwarding.
You can enable it and pass "-s none" to ssh.

diff -r 8354ab3a7042 -r d1a4574fa534 .ssh/config
--- a/.ssh/config	Tue Feb 07 01:33:56 2012 +0200
+++ b/.ssh/config	Mon Feb 13 17:06:41 2012 +0200
@@ -1,9 +1,12 @@
+
+Host *
 
 # Allow sharing of multiple sessions over a single network connection for all
 # host. Also don't prompt for password when connection live.
-Host *
-ControlPath ~/.ssh/sock_%r@%h_%p
-ControlMaster auto
+# This option was disabled to simplify use of port forwarding.
+# You can enable it and pass "-s none" to ssh.
+# ControlPath ~/.ssh/sock_%r@%h_%p
+# ControlMaster auto
 
 # This by default.
 # UserKnownHostsFile ~/.ssh/known_hosts