Merge of main trunk, all conflicts resolved.
authorRichard Levitte <levitte@openssl.org>
Wed, 20 Sep 2000 17:06:25 +0000 (17:06 +0000)
committerRichard Levitte <levitte@openssl.org>
Wed, 20 Sep 2000 17:06:25 +0000 (17:06 +0000)
commit775c289db56ff463d252370caa3aac72aaef1ea3
tree0e3c6f7adf4f36c4286c465e427596bb55fddd2a
parent099f5bfeba3cae1324ffa769f6a44446395ae437
Merge of main trunk, all conflicts resolved.
doc/ssl/SSL_SESSION_free.pod
doc/ssl/SSL_free.pod