[openssl] master update

[tmraz at fedoraproject.org]

The branch master has been updated
       via  6857058016e91d3182c2117922dd8001b27f5639 (commit)
      from  a3d267f18492a1e874534d5af6072bc8b7a290e5 (commit)


- Log -----------------------------------------------------------------
commit 6857058016e91d3182c2117922dd8001b27f5639
Author: Tim Hitchins <tim.hitchins at ekkosense.co.uk>
Date:   Wed Jan 20 11:35:33 2021 +0000

    Fix typo in crl2pkcs documentation
    
    Fixes #13910
    
    CLA: trivial
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13911)

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

Summary of changes:
 doc/man1/openssl-crl2pkcs7.pod.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/man1/openssl-crl2pkcs7.pod.in b/doc/man1/openssl-crl2pkcs7.pod.in
index db06f6e68f..7e57820ff7 100644
--- a/doc/man1/openssl-crl2pkcs7.pod.in
+++ b/doc/man1/openssl-crl2pkcs7.pod.in
@@ -55,7 +55,7 @@ output by default.
 
 Specifies a filename containing one or more certificates in B<PEM> format.
 All certificates in the file will be added to the PKCS#7 structure. This
-option can be used more than once to read certificates form multiple
+option can be used more than once to read certificates from multiple
 files.
 
 =item B<-nocrl>