[openssl] OpenSSL_1_1_1-stable update

[patrick.steuer at de.ibm.com]

The branch OpenSSL_1_1_1-stable has been updated
       via  31c3127a94506700a045d00bfe6333cf1258db07 (commit)
      from  1e5565ddc20062f6bc581ed3a7825827833b8a32 (commit)


- Log -----------------------------------------------------------------
commit 31c3127a94506700a045d00bfe6333cf1258db07
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Wed Nov 13 18:39:51 2019 +0100

    testutil/init.c rename to testutil/testutil_init.c
    
    Avoid conflicts with some linkers.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10439)
    
    (cherry picked from commit e74b5dcf16dfd7c91d9f9a7e69c447f00d778e17)
    
    Conflicts:
    	test/build.info

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

Summary of changes:
 test/build.info                           | 2 +-
 test/testutil/{init.c => testutil_init.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/testutil/{init.c => testutil_init.c} (100%)

diff --git a/test/build.info b/test/build.info
index db28dd97f7..9b57edf518 100644
--- a/test/build.info
+++ b/test/build.info
@@ -12,7 +12,7 @@ IF[{- !$disabled{tests} -}]
   SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \
           testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \
           testutil/format_output.c testutil/tap_bio.c \
-          testutil/test_cleanup.c testutil/main.c testutil/init.c \
+          testutil/test_cleanup.c testutil/main.c testutil/testutil_init.c \
           testutil/random.c
   INCLUDE[libtestutil.a]=../include
   DEPEND[libtestutil.a]=../libcrypto
diff --git a/test/testutil/init.c b/test/testutil/testutil_init.c
similarity index 100%
rename from test/testutil/init.c
rename to test/testutil/testutil_init.c