Merge from main trunk. No conflicts.
authorRichard Levitte <levitte@openssl.org>
Thu, 21 Sep 2000 07:38:47 +0000 (07:38 +0000)
committerRichard Levitte <levitte@openssl.org>
Thu, 21 Sep 2000 07:38:47 +0000 (07:38 +0000)
commita9c33b529e32d3bc0686e7a7ce8225c13629f0f6
tree50cd507769803339f18fc0b5fdacac2507713d2f
parent5deb47f12a3c420d92d4fdf27780defeb5e67844
Merge from main trunk.  No conflicts.
15 files changed:
Configure
Makefile.org
TABLE
apps/s_socket.c
apps/speed.c
config
crypto/bio/bss_conn.c
crypto/des/read_pwd.c
crypto/rand/rand_win.c
doc/ssl/SSL_accept.pod
doc/ssl/SSL_connect.pod
doc/ssl/SSL_read.pod
doc/ssl/SSL_write.pod
e_os.h
ssl/ssl2.h