[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  a1fc4642e1cedbce54945da36d256bbb12ff752d (commit)
      from  b40498c6e7c6726cc4fc8fef5346f743fdd48aaf (commit)


- Log -----------------------------------------------------------------
commit a1fc4642e1cedbce54945da36d256bbb12ff752d
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 16 10:24:18 2020 +0200

    dev/release.sh: improve instruction for pushing the tag
    
    'git push --follow-tags' does a little too much, any spurious tag
    object that the releaser have in their local repository will come
    along, even though they have nothing to do with the commits being
    pushed.
    
    Therefore, we modify the instructions to show a separate and explicit
    push of the release tag.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13159)

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

Summary of changes:
 dev/release.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev/release.sh b/dev/release.sh
index 98fdd6a580..be8c89bb69 100755
--- a/dev/release.sh
+++ b/dev/release.sh
@@ -556,10 +556,12 @@ Push them to github, make PRs from them and have them approved:
 
 When merging them into the main repository, do it like this:
 
-    git push --follow-tags openssl-git at git.openssl.org:openssl.git \\
+    git push openssl-git at git.openssl.org:openssl.git \\
         $tmp_release_branch:$release_branch
     git push openssl-git at git.openssl.org:openssl.git \\
         $tmp_update_branch:$update_branch
+    git push openssl-git at git.openssl.org:openssl.git \\
+        $tag
 EOF
 else
 cat <<EOF
@@ -570,8 +572,10 @@ Push it to github, make a PR from it and have it approved:
 
 When merging it into the main repository, do it like this:
 
-    git push --follow-tags openssl-git at git.openssl.org:openssl.git \\
+    git push openssl-git at git.openssl.org:openssl.git \\
         $tmp_release_branch:$release_branch
+    git push openssl-git at git.openssl.org:openssl.git \\
+        $tag
 EOF
 fi