Merge branch '4.next'

[exim.git] / doc / doc-txt / ChangeLog

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 0188488e10fba11164b94ac22d7f06392258ff7f..02ea32aa3a61aa37c8cf098bd7add4b413b3a75a 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -2,7 +2,7 @@ This document describes *changes* to previous versions, that might
 affect Exim's operation, with an unchanged configuration file.  For new
 options, and new features, see the NewStuff file next to this ChangeLog.
 
-SINCE Exim version 4.96
+Exim version 4.97
 -----------------
 
 JH/01 The hosts_connection_nolog main option now also controls "no MAIL in
@@ -157,6 +157,12 @@ JH/32 Fix CHUNKING for a second message on a connection when the first was
       erroneously rejected the BDAT command.  Investigation help from
       Jesse Hathaway.
 
+JH/33 Fis ${srs_encode ...} to handle an empty sender address, now returning
+      an empty address.  Previously the expansion returned an error.
+
+HS/01 Bug 2855: Handle a v4mapped sender address given us by a frontending
+      proxy.  Previously these were misparsed, leading to paniclog entries.
+
 
 Exim version 4.95
 -----------------