[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d5e08231dbef819b1d5381f851e72410df140f94 (commit)
      from  9e7a6411708702dd4ad4657636ab346382234437 (commit)


- Log -----------------------------------------------------------------
commit d5e08231dbef819b1d5381f851e72410df140f94
Author: Matt Caswell <matt at openssl.org>
Date:   Thu May 20 10:47:47 2021 +0100

    Refer to the migration guide rather than the wiki in our announcements
    
    We now have a migration guide which should be the definitive source of
    information for upgrading from a previous version of OpenSSL.
    
    Fixes #15186
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15373)

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

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

diff --git a/dev/release-aux/openssl-announce-pre-release.tmpl b/dev/release-aux/openssl-announce-pre-release.tmpl
index 6557d25e0d..470a42bdd3 100644
--- a/dev/release-aux/openssl-announce-pre-release.tmpl
+++ b/dev/release-aux/openssl-announce-pre-release.tmpl
@@ -12,10 +12,10 @@
    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:
+   Specific notes on upgrading to OpenSSL $series from previous versions are
+   available in the OpenSSL Migration Guide, here:
 
-        https://wiki.openssl.org/index.php/OpenSSL_$series
+        https://www.openssl.org/docs/manmaster/man7/migration_guide.html
 
    The $label release is available for download via HTTPS and FTP from the
    following master locations (you can find the various FTP mirrors under
diff --git a/dev/release-aux/openssl-announce-release.tmpl b/dev/release-aux/openssl-announce-release.tmpl
index 5e08f2e5c9..fcd8087bf3 100644
--- a/dev/release-aux/openssl-announce-release.tmpl
+++ b/dev/release-aux/openssl-announce-release.tmpl
@@ -11,10 +11,10 @@
 
         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:
+   Specific notes on upgrading to OpenSSL $series from previous versions are
+   available in the OpenSSL Migration Guide, here:
 
-        https://wiki.openssl.org/index.php/OpenSSL_$series
+        https://www.openssl.org/docs/man$series/man7/migration_guide.html
 
    OpenSSL $release is available for download via HTTPS and FTP from the
    following master locations (you can find the various FTP mirrors under