[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  ecf15b16ee8223a9a383b97ee41126fbedf89bb5 (commit)
      from  7f9e74403677a995ded00f070d84297401f6e3fd (commit)


- Log -----------------------------------------------------------------
commit ecf15b16ee8223a9a383b97ee41126fbedf89bb5
Author: Alexander Borkowski <alex-b at opus-b.com>
Date:   Sat Jul 20 07:47:11 2019 +0200

    s_client.pod: Fix grammar in NOTES section.
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9421)

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

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

diff --git a/doc/man1/openssl-s_client.pod.in b/doc/man1/openssl-s_client.pod.in
index 594d26f9bd..bd4ceee5df 100644
--- a/doc/man1/openssl-s_client.pod.in
+++ b/doc/man1/openssl-s_client.pod.in
@@ -872,7 +872,7 @@ server.
 
 This command is a test tool and is designed to continue the
 handshake after any certificate verification errors. As a result it will
-accept any certificate chain (trusted or not) sent by the peer. None test
+accept any certificate chain (trusted or not) sent by the peer. Non-test
 applications should B<not> do this as it makes them vulnerable to a MITM
 attack. This behaviour can be changed by with the B<-verify_return_error>
 option: any verify errors are then returned aborting the handshake.