From a389bab24868d3e56adb9eba9143ed769b84fccb Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 12 Jun 2015 11:40:06 -0700
Subject: [PATCH] update history

Conflicts:
	HISTORY.md
---
 HISTORY.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/HISTORY.md b/HISTORY.md
index c82a692b3..046cfc47c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,3 +1,7 @@
+Fri Jun 12 11:37:41 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* Prevent extremely deep parameters from being parsed. CVE-2015-3225
+
 ### December 18th, Thirty sixth public release 1.6.0
   - See the [git history](https://github.com/rack/rack/compare/1.5.2...1.6.0)