From ea04d68ad9743f3e7fb695beadf052ca77db7e02 Mon Sep 17 00:00:00 2001
From: Hiroshi Nakamura <nahi@ruby-lang.org>
Date: Fri, 17 Oct 2014 01:15:21 +0900
Subject: [PATCH] Version bump to 2.5.0

---
 CHANGELOG.md              | 27 +++++++++++++++++++++++++++
 README.md                 |  4 ++++
 lib/httpclient/version.rb |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29efd1ca..9c54224a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 ## Changes
 
+### Changes in 2.5.0
+
+Oct 17, 2014 - version 2.5.0
+
+**IMPORTANT CHANGES**
+
+This version changes (again) default SSL options to help
+BEAST/CRIME/POODLE Attach prevension.
+
+ * Disabled SSLv3 in favor of POODLE Attach prevention.
+ * Enabled 1/n-1 fragment in favor of BEAST Attach prevention.
+ * No TLS compression in favor of CRIME Attach prevention.
+
+You can restore the previous SSL configuration like this;
+
+```ruby
+client = HTTPClient.new
+client.ssl_config.ssl_version = :SSLv23
+client.ssl_config.options = OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2
+```
+
+  * Changes
+	* Change default SSL options. See above.
+    * Keep cause error of KeepAliveDisconnected. It allows caller to
+	  investigate the cause of KeepAliveDisconnected.
+
+
 ### Changes in 2.4.0
 
 Jun 8, 2014 - version 2.4.0
diff --git a/README.md b/README.md
index f8792ca6..ce5506cf 100644
--- a/README.md
+++ b/README.md
@@ -78,3 +78,7 @@ Please file a ticket at the project web site.
 1. find a similar ticket from https://github.com/nahi/httpclient/issues
 2. create a new ticket by clicking 'Create Issue' button.
 3. you can use github features such as pull-request if you like.
+
+## Changes
+
+See [ChangeLog](https://github.com/nahi/httpclient/blob/master/CHANGELOG.md)
diff --git a/lib/httpclient/version.rb b/lib/httpclient/version.rb
index 0766d6e0..b5ef2141 100644
--- a/lib/httpclient/version.rb
+++ b/lib/httpclient/version.rb
@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end