From 196c7b7e6d567dc5a4e9a70001e52c8b970ff318 Mon Sep 17 00:00:00 2001
From: Jason Evans <je@fb.com>
Date: Mon, 14 Nov 2011 17:12:45 -0800
Subject: [PATCH] Update ChangeLog for 2.2.5.

---
 ChangeLog | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 61979683..326ee7a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,14 @@ found in the git revision history:
     http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git
     git://canonware.com/jemalloc.git
 
+* 2.2.5 (November 14, 2011)
+
+  Bug fixes:
+  - Fix huge_ralloc() race when using mremap(2).  This is a serious bug that
+    could cause memory corruption and/or crashes.
+  - Fix huge_ralloc() to maintain chunk statistics.
+  - Fix malloc_stats_print(..., "a") output.
+
 * 2.2.4 (November 5, 2011)
 
   Bug fixes: