Merge branch '4.next'

diff --cc doc/doc-docbook/spec.xfpt
index 48cb0155e78d1db7250019dca19cef740ae33dd6,9c011a989fb691b6cbfbbcbbc81d6672ce137c7b..7440a4c06949ec26170789779ba10d66ffb68d34
--- 1/doc/doc-docbook/spec.xfpt
--- 2/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@@ -17116,7 -17139,9 +17116,8 @@@ separator in the usual way to avoid con
  &*Note*&: Under current versions of OpenSSL, when a list of more than one
  file is used, the &$tls_in_ourcert$& veriable is unreliable.
  
- &*Note*&: OCSP stapling is not usable when a list of more than one file is used.
+ &*Note*&: OCSP stapling is not usable under OpenSSL
+ when a list of more than one file is used.
 -.wen
  
  If the option contains &$tls_out_sni$& and Exim is built against OpenSSL, then
  if the OpenSSL build supports TLS extensions and the TLS client sends the

diff --cc doc/doc-txt/ChangeLog
index 824ae232e6c0ca71ed70777c566ec1c1a2c9602e,fcd5e691f071b83f15299bacf6d34208e5f66814..d4b1820d5c3b87fefac4c54fa913e051e75c7afd
--- 1/doc/doc-txt/ChangeLog
--- 2/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@@ -5,6 -5,14 +5,14 @@@ affect Exim's operation, with an unchan
  options, and new features, see the NewStuff file next to this ChangeLog.
  
  
 -Exim version 4.next
++Exim version 4.91
+ -----------------
+ 
+ JH/01 Replace the store_release() internal interface with store_newblock(),
+       which internalises the check required to safely use the old one, plus
+       the allocate and data copy operations duplicated in both (!) of the
+       extant use locations.
+ 
  Exim version 4.90
  -----------------
  

diff --cc doc/doc-txt/NewStuff
index 4261beb766f273983405bd80d361329c3a73633f,f53ce5741174bf2c9562d8f5caa7c2cccc937d96..df7055a369113bca34072c37cf1c67a082cdf8ad
--- 1/doc/doc-txt/NewStuff
--- 2/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@@ -6,6 -6,16 +6,16 @@@ Before a formal release, there may be q
  test from the snapshots or the Git before the documentation is updated. Once
  the documentation is updated, this file is reduced to a short list.
  
 -Version 4.next
++Version 4.91
+ --------------
+ 
+  1. Dual-certificate stacks on servers now support OCSP stapling, under GnuTLS
+     version 3.5.6 or later.
+ 
+  2. DANE is now supported under GnuTLS version 3.0.0 or later (adding to the
+     previous OpenSSL implementation, but still Experimental).
+ 
+ 
  Version 4.90
  ------------
  

diff --cc src/src/receive.c
Simple merge

diff --cc src/src/tls-openssl.c
Simple merge

diff --cc test/confs/5860
Simple merge