Merge of main trunk, conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Wed, 13 Sep 2000 21:20:49 +0000 (21:20 +0000)
committerRichard Levitte <levitte@openssl.org>
Wed, 13 Sep 2000 21:20:49 +0000 (21:20 +0000)
commit0dcf7fd543257558bba857c8ba07cb4189847e22
treeede06dd7be0ac248bddcea6c19c8080ea80f3ace
parent02539402afe25638555bc0e892a10ff414b20971
Merge of main trunk, conflicts resolved.
CHANGES
Configure
STATUS
crypto/dsa/dsa_key.c
crypto/dsa/dsa_ossl.c
crypto/rand/rand_win.c
doc/crypto/BIO_read.pod
doc/crypto/BIO_should_retry.pod
ssl/s3_pkt.c
ssl/ssl.h