Merge of main trunk, all conflicts resolved.

diff --git a/doc/ssl/SSL_SESSION_free.pod b/doc/ssl/SSL_SESSION_free.pod
index 5e104d5f2f5792a4168dd616f479151750d56874..df30ccbb320f9a916392dc15e303fd536ade363c 100644 (file)
--- a/doc/ssl/SSL_SESSION_free.pod
+++ b/doc/ssl/SSL_SESSION_free.pod
@@ -8,7 +8,7 @@ SSL_SESSION_free - free an allocated SSL_SESSION structure
 
  #include <openssl/ssl.h>
 
- void *SSL_SESSION_free(SSL_SESSION *session);
+ void SSL_SESSION_free(SSL_SESSION *session);
 
 =head1 DESCRIPTION
 

diff --git a/doc/ssl/SSL_free.pod b/doc/ssl/SSL_free.pod
index 3bbde4273c9bca1c76fb0340ee79d9db8ae1e3d7..f3f0c345f8a1fb6feecfe10074b40f893fca7e9b 100644 (file)
--- a/doc/ssl/SSL_free.pod
+++ b/doc/ssl/SSL_free.pod
@@ -8,7 +8,7 @@ SSL_free - free an allocated SSL structure
 
  #include <openssl/ssl.h>
 
- void *SSL_free(SSL *ssl);
+ void SSL_free(SSL *ssl);
 
 =head1 DESCRIPTION