Merge branch 'maint'

* maint:
  Ruby/OpenSSL 2.0.5
  ssl: fix compile error with OpenSSL 1.0.0
  ssl: remove unsupported TLS versions from SSLContext::METHODS
  Add msys2 library dependency tag in gem metadata
  ossl_pem_passwd_cb: handle nil from the block explicitly
  ossl_pem_passwd_cb: do not check for taintedness
  ossl_pem_passwd_cb: relax passphrase length constraint
  appveyor.yml: test against Ruby 2.4
  Rakefile: install_dependencies: install only when needed
  bio: do not use the FILE BIO method in ossl_obj2bio()
  bio: prevent possible GC issue in ossl_obj2bio()
  test/test_ssl: allow 3DES cipher suites in test_sslctx_set_params

1 files changed, 13 insertions, 0 deletions

diff --git a/History.md b/History.md
index 118ce20e..941fba05 100644
--- a/History.md
+++ b/History.md
@@ -23,6 +23,19 @@ Deprecations
 ------------
 
 
+Version 2.0.5
+=============
+
+Bug fixes
+---------
+
+* Reading a PEM/DER-encoded private key or certificate from an IO object did
+  not work properly on mswin platforms.
+  [[ruby/openssl#128]](https://github.com/ruby/openssl/issues/128)
+* Broken length check in the PEM passphrase callback is fixed.
+* It failed to compile when OpenSSL is configured without TLS 1.0 support.
+
+
 Version 2.0.4
 =============