[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  0d4c52320d245be80bd69346fdda4b12b4961eae (commit)
      from  7db69a35f9d2c7ac8029de11115b18a57d341bf5 (commit)


- Log -----------------------------------------------------------------
commit 0d4c52320d245be80bd69346fdda4b12b4961eae
Author: Tomas Mraz <tomas at openssl.org>
Date:   Fri Dec 17 17:42:33 2021 +0100

    Fix fixup postrelease scripts to avoid creating errors
    
    Otherwise the NEWS.md and CHANGES.md will contain trailing spaces.
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17304)
    
    (cherry picked from commit 132ab70fd852729e7ce41ac7ef2cb2f9969f8b7e)

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

Summary of changes:
 dev/release-aux/fixup-CHANGES.md-postrelease.pl | 2 +-
 dev/release-aux/fixup-NEWS.md-postrelease.pl    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/release-aux/fixup-CHANGES.md-postrelease.pl b/dev/release-aux/fixup-CHANGES.md-postrelease.pl
index 0fb2e9134f..bb971898ca 100644
--- a/dev/release-aux/fixup-CHANGES.md-postrelease.pl
+++ b/dev/release-aux/fixup-CHANGES.md-postrelease.pl
@@ -20,7 +20,7 @@ if (/^### Changes between (\S+) and (\S+) \[xx XXX xxxx\]/
         $_ = <<_____
 ### Changes between $v2 and $RELEASE_TEXT [xx XXX xxxx]
 
- * 
+ * none yet
 
 ### Changes between $v1 and $v2 [$PREV_RELEASE_DATE]
 _____
diff --git a/dev/release-aux/fixup-NEWS.md-postrelease.pl b/dev/release-aux/fixup-NEWS.md-postrelease.pl
index ff41ab29df..9231872f89 100644
--- a/dev/release-aux/fixup-NEWS.md-postrelease.pl
+++ b/dev/release-aux/fixup-NEWS.md-postrelease.pl
@@ -20,7 +20,7 @@ if (/^### Major changes between OpenSSL (\S+) and OpenSSL (\S+) \[under developm
         $_ = <<_____
 ### Major changes between OpenSSL $v2 and OpenSSL $RELEASE_TEXT [under development]
 
- * 
+  * none
 
 ### Major changes between OpenSSL $v1 and OpenSSL $v2 [$PREV_RELEASE_DATE]
 _____