[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6 (commit)
      from  907d2c2f62c45199d12138e597bf343283b80b12 (commit)


- Log -----------------------------------------------------------------
commit ea7736a0930d8c9dd3d4d1a3b3e001ff56364bd6
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Feb 10 08:42:33 2016 -0500

    No dynamic-init fix; merge goof.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/init.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crypto/init.c b/crypto/init.c
index 5ecd6ba..e2f3583 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -604,7 +604,6 @@ void OPENSSL_INIT_library_stop(void)
     CONF_modules_free();
     RAND_cleanup();
     base_inited = 0;
-    OPENSSL_INIT_ONCE_DYNAMIC_INIT(&base);
 }
 
 static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting(