Merge from 0.9.6-stable branch. No conflicts.

2001-07-05 13:56:50 +00:00
parent 4ae5099856
commit 393a9b68cf
13 changed files with 371 additions and 206 deletions
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -430,7 +430,6 @@ int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
 			CRYPTO_get_lock_name(type),
 			file,line);
 #endif
-		*pointer=ret;
 		}
 	else
 		{