[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  3a1ec0c269d1d694a2abeba70653da3f8706c0ab (commit)
      from  f06c5547605b1e400f95eafb77a42947e4d50b78 (commit)


- Log -----------------------------------------------------------------
commit 3a1ec0c269d1d694a2abeba70653da3f8706c0ab
Author: Theo Buehler <tb at openbsd.org>
Date:   Thu Jun 24 11:37:04 2021 +0200

    Fix two typos in OSSL_trace_enabled.pod
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15894)

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

Summary of changes:
 doc/man3/OSSL_trace_enabled.pod | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/man3/OSSL_trace_enabled.pod b/doc/man3/OSSL_trace_enabled.pod
index 896f306a2d..f9c9dffd8c 100644
--- a/doc/man3/OSSL_trace_enabled.pod
+++ b/doc/man3/OSSL_trace_enabled.pod
@@ -234,7 +234,7 @@ The macro B<OPENSSL_NO_TRACE> is defined in F<< <openssl/opensslconf.h> >>.
 
 =item *
 
-all functions are still present, bu OSSL_trace_enabled() will always
+all functions are still present, but OSSL_trace_enabled() will always
 report the categories as disabled, and all other functions will do
 nothing.
 
@@ -278,7 +278,7 @@ otherwise NULL.
 
 =head1 HISTORY
 
-The OpenSSL Tracing API was added ino OpenSSL 3.0.
+The OpenSSL Tracing API was added in OpenSSL 3.0.
 
 =head1 COPYRIGHT