[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  486d8973bf2726e3d24438006fd2449bdab24e9e (commit)
      from  aa45c4a9d35a8082c7ba326c19b97200001c9d82 (commit)


- Log -----------------------------------------------------------------
commit 486d8973bf2726e3d24438006fd2449bdab24e9e
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 21 15:13:30 2020 +0100

    Mention the 3.0 wiki page in the release announcement emails
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/11593)

-----------------------------------------------------------------------

Summary of changes:
 dev/release-aux/openssl-announce-pre-release.tmpl | 7 ++++++-
 dev/release-aux/openssl-announce-release.tmpl     | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dev/release-aux/openssl-announce-pre-release.tmpl b/dev/release-aux/openssl-announce-pre-release.tmpl
index 2f3b5d36f4..1797b40549 100644
--- a/dev/release-aux/openssl-announce-pre-release.tmpl
+++ b/dev/release-aux/openssl-announce-pre-release.tmpl
@@ -8,13 +8,18 @@
    OpenSSL $series is currently in $label.
 
    OpenSSL $release_text has now been made available.  For details of
-   changes and known issues see the release notes at:
+   the changes, see the release notes at:
 
         https://www.openssl.org/news/openssl-$series-notes.html
 
    Note: This OpenSSL pre-release has been provided for testing ONLY.
    It should NOT be used for security critical purposes.
 
+   Specific notes on upgrading to OpenSSL $series from previous versions, as well
+   as known issues are available on the OpenSSL Wiki, here:
+
+        https://wiki.openssl.org/index.php/OpenSSL_$series
+
    The $label release is available for download via HTTPS and FTP from the
    following master locations (you can find the various FTP mirrors under
    https://www.openssl.org/source/mirror.html):
diff --git a/dev/release-aux/openssl-announce-release.tmpl b/dev/release-aux/openssl-announce-release.tmpl
index 8e708c2253..5e08f2e5c9 100644
--- a/dev/release-aux/openssl-announce-release.tmpl
+++ b/dev/release-aux/openssl-announce-release.tmpl
@@ -7,10 +7,15 @@
 
    The OpenSSL project team is pleased to announce the release of
    version $release of our open source toolkit for SSL/TLS.
-   For details of changes and known issues see the release notes at:
+   For details of the changes, see the release notes at:
 
         https://www.openssl.org/news/openssl-$series-notes.html
 
+   Specific notes on upgrading to OpenSSL $series from previous versions, as well
+   as known issues are available on the OpenSSL Wiki, here:
+
+        https://wiki.openssl.org/index.php/OpenSSL_$series
+
    OpenSSL $release is available for download via HTTPS and FTP from the
    following master locations (you can find the various FTP mirrors under
    https://www.openssl.org/source/mirror.html):