[ruby-cvs:78494] dcc0a529b7 (ruby_2_5): merge revision(s) 2a477e0e444de6344048101466fb9189b9defddc: [Backport #16353]

usa	2019-12-04 15:52:01 +0900 (Wed, 04 Dec 2019)

  New Revision: dcc0a529b7

  https://github.com/ruby/ruby/commit/dcc0a529b7

  Log:
    merge revision(s) 2a477e0e444de6344048101466fb9189b9defddc: [Backport #16353]
    
    test_ftp.rb: loosen timeout for Travis osx
    
    https://travis-ci.org/ruby/ruby/jobs/454798071
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

  Modified files:
    test/net/ftp/test_ftp.rb
    version.h