Merge branch 'exim-4_84+CVE-2016-1531' into exim-4_84_2+fixes

1 files changed, 13 insertions, 2 deletions

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index c883b5108..8ffc963a4 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,7 +1,8 @@
 Change log file for Exim from version 4.21
 -------------------------------------------
 
-Exim version 4.84+fixes
+
+Exim version 4.84.2+fixes
 -----------------------
 Cherry-Picked from the master development branch
 for complaints please contact hs@schlittermann.de
@@ -14,7 +15,6 @@ JH/38 Fix cutthrough bug with body lines having a single dot. The dot was
       received - but deduplicating mailstores were liable to retain only the
       initial truncated version.
 
-
 JH/05 Fix results-pipe from transport process.  Several recipients, combined
       with certificate use, exposed issues where response data items split
       over buffer boundaries were not parsed properly.  This eventually
@@ -22,7 +22,18 @@ JH/05 Fix results-pipe from transport process.  Several recipients, combined
       to notice due to the introduction of conection certificate information,
       the item size being so much larger.  Found and fixed by Wolfgang Breyha.
 
+
+Exim version 4.84.2
+-------------------
+Portability release
+
+
+Exim version 4.84.1
+-------------------
 HS/04 Add support for keep_environment and add_environment options.
+      Fix for CVE-2016-1531
+
+
 Exim version 4.84
 -----------------
 TL/01 Bugzilla 1506: Re-add a 'return NULL' to silence complaints from static