Merge branch 'master' into todd_prdr

Conflicts:
	doc/doc-txt/ChangeLog

diff --cc doc/doc-txt/ChangeLog
index e8da78188061f596697d823826f80c2f94441934,924b0b8e42ccfa642a111317b5cd989eb3d22e53..ffdec5cf0b010bdceb25a52dfc37b3dabcb61da0
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -150,18 -150,10 +150,22 @@@ PP/14 Fix OCSP reinitialisation in SNI 
  
  JH/13 Add $router_name and $transport_name variables.  Bugzilla 308.
  
+ PP/15 Define SIOCGIFCONF_GIVES_ADDR for GNU Hurd.
+       Bug detection, analysis and fix by Samuel Thibault.
+       Bugzilla 1331, Debian bug #698092.
+ 
 +JH/14 SMTP PRDR (http://www.eric-a-hall.com/specs/draft-hall-prdr-00.txt).
 +      Server implementation by Todd Lyons, client by JH.
 +      Only enabled when compiled with EXPERIMENTAL_PRDR.  A new
 +      config variable "prdr_enable" controls whether the server
 +      advertises the facility.  If the client requests PRDR a new
 +      acl_data_smtp_prdr ACL is called once for each recipient, after
 +      the body content is received and before the acl_smtp_data ACL.
 +      The client is controlled by bolth of: a hosts_try_prdr option
 +      on the smtp transport, and the server advertisement.
 +      Default client logging of deliveries and rejections involving
 +      PRDR are flagged with the string "PRDR".
 +
  
  Exim version 4.80.1
  -------------------