Merge from main trunk, conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Sat, 14 Oct 2000 21:15:41 +0000 (21:15 +0000)
committerRichard Levitte <levitte@openssl.org>
Sat, 14 Oct 2000 21:15:41 +0000 (21:15 +0000)
commit757ab9b5065375d14042c26ac09446fc12141bd7
tree031b29b6b858ba6e347fa48677fd413399044dda
parent868af8e4be0491e7251eeeb298f656943e4a8e00
Merge from main trunk, conflicts resolved.
25 files changed:
CHANGES
Configure
Makefile.org
TABLE
config
crypto/bio/b_sock.c
crypto/bio/bio.h
crypto/bio/bss_acpt.c
crypto/conf/conf.h
crypto/conf/conf_err.c
crypto/conf/conf_lib.c
crypto/opensslv.h
crypto/rand/randtest.c
doc/crypto/BIO_s_accept.pod
doc/ssl/SSL_CTX_load_verify_locations.pod
doc/ssl/SSL_accept.pod
doc/ssl/SSL_connect.pod
doc/ssl/SSL_read.pod
doc/ssl/SSL_write.pod
doc/ssl/ssl.pod
ssl/bio_ssl.c
ssl/ssl.h
ssl/ssl_lib.c
util/libeay.num
util/selftest.pl