[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d7e4aecd89872112837baff6777147bb4b4d36bf (commit)
      from  d8fef6da579c23956c57b03488cb8702cd6d2066 (commit)


- Log -----------------------------------------------------------------
commit d7e4aecd89872112837baff6777147bb4b4d36bf
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 12 17:41:29 2019 +0000

    Add confdump to .gitignore
    
    We added a new executable to the test directory which didn't match the
    existing gitignore rules, so we add it explicitly.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10430)

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

Summary of changes:
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fa57dfcb38..8629499c49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ doc/man1/openssl-x509.pod
 /test/versions
 /test/ossl_shim/ossl_shim
 /test/rsa_complex
+/test/confdump
 # Other generated files in test/
 /test/provider_internal_test.conf
 /test/fipsinstall.conf