Merge branch 'maint'

This also restores 'if defined?(OpenSSL)-end' wrapping the test code.
They have been removed erroneously by commit 4eb4b3297a92 ("Remove
support for OpenSSL 0.9.8 and 1.0.0", 2016-11-30).

* maint:
  test/test_ssl: explicitly accept TLS 1.1 in corresponding test
  ssl: remove useless call to rb_thread_wait_fd()
  test/test_pair, test/test_ssl: fix for TLS 1.3
  test/test_ssl_session: rearrange tests
  test/test_ssl: move test_multibyte_read_write to test_pair
  test/test_ssl: remove test_invalid_shutdown_by_gc
  test/utils: do not use DSA certificates in SSL tests
  test/utils: add OpenSSL::TestUtils.openssl? and .libressl?
  test/utils: improve error handling in start_server
  test/utils: let server_loop close socket
  test/utils: do not set ecdh_curves in start_server
  test/utils: have start_server yield only the port number
  test/utils: add SSLTestCase#tls12_supported?
  test/utils: remove OpenSSL::TestUtils.silent
  test: fix formatting
  Rakefile: let sync:to_ruby know about test/openssl/fixtures
  cipher: update the documentation for Cipher#auth_tag=
  Backport "Merge branch 'topic/test-memory-leak'" to maint
  ssl: do not call session_remove_cb during GC

1 files changed, 3 insertions, 2 deletions

diff --git a/Rakefile b/Rakefile
index 8ba95aa9..d63267d7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -58,11 +58,12 @@ namespace :sync do
 
     paths = [
       ["ext/openssl/", "ext/openssl/"],
+      ["lib/", "ext/openssl/lib/"],
+      ["sample/", "sample/openssl/"],
+      ["test/fixtures/", "test/openssl/fixtures/"],
       ["test/utils.rb", "test/openssl/"],
       ["test/ut_eof.rb", "test/openssl/"],
       ["test/test_*", "test/openssl/"],
-      ["lib/", "ext/openssl/lib/"],
-      ["sample/", "sample/openssl/"],
       ["History.md", "ext/openssl/"],
     ]
     paths.each do |src, dst|