From: Todd Lyons <tlyons@exim.org>
Date: Tue, 13 May 2014 18:36:35 +0000 (-0700)
Subject: Updated changelog.
X-Git-Tag: exim-4_83_RC1~21
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8ded85897157e148f4c88692ac7b23ac7cb164cd;p=exim.git

Updated changelog.

Accidentally included the fix for Bug 1119 in the same commit fixing
  Proxy Protocol version 2 to match the API change in May 2014.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 276876fe6..22be3438e 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -25,7 +25,8 @@ TL/01 LDAP support uses per connection or global context settings, depending
 
 TL/02 Experimental Proxy Protocol support: allows a proxied SMTP connection
       to extract and use the src ip:port in logging and expansions as if it
-      were a direct connection from the outside internet.
+      were a direct connection from the outside internet. PPv2 support was
+      updated based on HAProxy spec change in May 2014.
 
 JH/02 Add ${listextract {number}{list}{success}{fail}}.
 
@@ -117,6 +118,9 @@ JH/22 Expansion operators ${md5:string} and ${sha1::string} can now
 
 JH/23 The PRDR feature is moved from being Experimental into the mainline.
 
+TL/11 Bug 1119: fix memory allocation in string_printing2().  Patch from
+      Christian Aistleitner.
+
 
 Exim version 4.82
 -----------------