diff -ruN zabbix-original/src/libs/zbxcrypto/tls.c zabbix/src/libs/zbxcrypto/tls.c
--- zabbix-original/src/libs/zbxcrypto/tls.c	2016-02-01 22:38:28.255770461 -0500
+++ zabbix/src/libs/zbxcrypto/tls.c	2016-02-01 22:41:25.822032910 -0500
@@ -116,6 +116,81 @@
 ZBX_THREAD_LOCAL char				info_buf[256];
 #endif
 
+#if defined(HAVE_OPENSSL)
+int THREAD_setup(void);
+int THREAD_cleanup(void);
+ 
+#if defined(_WINDOWS)
+	#define MUTEX_TYPE				HANDLE
+	#define MUTEX_SETUP(x)		(x) = CreateMutex(NULL, FALSE, NULL)
+	#define MUTEX_CLEANUP(x)	CloseHandle(x)
+	#define MUTEX_LOCK(x)			WaitForSingleObject((x), INFINITE)
+	#define MUTEX_UNLOCK(x)		ReleaseMutex(x)
+	#define THREAD_ID					GetCurrentThreadId(  )
+#elif _POSIX_THREADS
+	/* _POSIX_THREADS is normally defined in unistd.h if pthreads are available
+	   on your platform. */
+	#define MUTEX_TYPE				pthread_mutex_t
+	#define MUTEX_SETUP(x)		pthread_mutex_init(&(x), NULL)
+	#define MUTEX_CLEANUP(x)	pthread_mutex_destroy(&(x))
+	#define MUTEX_LOCK(x)			pthread_mutex_lock(&(x))
+	#define MUTEX_UNLOCK(x)		pthread_mutex_unlock(&(x))
+	#define THREAD_ID					pthread_self(  )
+#else
+	#error You must define mutex operations appropriate for your platform!
+#endif
+ 
+/* This array will store all of the mutexes available to OpenSSL. */
+static MUTEX_TYPE mutex_buf[1000] = { NULL };
+ 
+static void locking_function(int mode, int n, const char * file, int line)
+{
+	if (mode & CRYPTO_LOCK)
+	{
+		MUTEX_LOCK(mutex_buf[n]);
+		zabbix_log(LOG_LEVEL_TRACE, "In locking_function: LOCK thread_id=%d", mutex_buf[n]);
+	}
+	else
+	{
+		MUTEX_UNLOCK(mutex_buf[n]);
+		zabbix_log(LOG_LEVEL_TRACE, "In locking_function: UNLOCK thread_id=%d", mutex_buf[n]);
+	}
+}
+ 
+static unsigned long id_function(void)
+{
+	zabbix_log(LOG_LEVEL_TRACE, "id_function: thread_id=%d", THREAD_ID);
+	return ((unsigned long)THREAD_ID);
+}
+
+int THREAD_setup(void)
+{
+	int i;
+	
+	zabbix_log(LOG_LEVEL_TRACE, "In THREAD_setup: CRYPTO_num_locks=%d",CRYPTO_num_locks(  ));
+	for (i = 0;  i < CRYPTO_num_locks(  );  i++)
+		MUTEX_SETUP(mutex_buf[i]);
+	CRYPTO_set_id_callback(id_function);
+	CRYPTO_set_locking_callback(locking_function);
+	return 1;
+}
+
+int THREAD_cleanup(void)
+{
+	int i;
+	
+	zabbix_log(LOG_LEVEL_TRACE, "In THREAD_cleanup: CRYPTO_num_locks=%d",CRYPTO_num_locks(  ));
+	if (!mutex_buf)
+		return 0;
+	CRYPTO_set_id_callback(NULL);
+	CRYPTO_set_locking_callback(NULL);
+	for (i = 0;  i < CRYPTO_num_locks(  );  i++)
+		MUTEX_CLEANUP(mutex_buf[i]);
+	free(mutex_buf);
+	return 1;
+}
+#endif
+
 #if defined(HAVE_POLARSSL)
 /**********************************************************************************
  *                                                                                *
@@ -2444,6 +2519,7 @@
 	SSL_load_error_strings();
 	ERR_load_BIO_strings();
 	SSL_library_init();             /* always returns "1" */
+	THREAD_setup();
 
 	init_done = 1;
 
@@ -2474,6 +2550,7 @@
 		init_done = 0;
 		RAND_cleanup();         /* erase PRNG state */
 		ERR_free_strings();
+		THREAD_cleanup();
 	}
 #endif
 }