Merge of main trunk, conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Tue, 12 Sep 2000 08:37:51 +0000 (08:37 +0000)
committerRichard Levitte <levitte@openssl.org>
Tue, 12 Sep 2000 08:37:51 +0000 (08:37 +0000)
commit2be96941164571dfbdf180a00b6ea4d00af53a1a
tree0d6b3cd63f4fcaf8494ce62a3d976c3a917617e7
parentb46ba9b1bcd1431b3675cacfab3c3666703a3685
Merge of main trunk, conflicts resolved.
CHANGES
Configure
STATUS
apps/CA.pl.in
apps/speed.c
crypto/rand/randfile.c
doc/crypto/BIO_read.pod
doc/crypto/BIO_should_retry.pod
util/mkdef.pl