Merge remote-tracking branch 'upstream/master' into keep_forwarding_in_pending_connection

Author: sawanoboly

.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+sudo: false
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - 2.3.0
+  - jruby-head
+  - rbx-2
+
+install: gem install test-unit mocha net-ssh net-ssh-gateway
+
+script: rake test
+
+matrix:
+  allow_failures:
+    - rvm: jruby-head

README.rdoc

@@ -66,7 +66,7 @@ If you want to run the tests or use any of the Rake tasks, you'll need:
 
 * gem install net-ssh-multi
 
-However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signiture[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
+However, in order to be sure the code you're installing hasn't been tampered with, it's recommended that you verify the signature[http://docs.rubygems.org/read/chapter/21]. To do this, you need to add my public key as a trusted certificate (you only need to do this once):
 
     # Add the public key as a trusted certificate
     # (You only need to do this once)

lib/net/ssh/multi/server.rb

@@ -1,4 +1,5 @@
 require 'net/ssh'
+require 'timeout'
 
 module Net; module SSH; module Multi
   # Encapsulates the connection information for a single remote server, as well