Commit 775c289d authored by Richard Levitte's avatar Richard Levitte
Browse files

Merge of main trunk, all conflicts resolved.

parent 099f5bfe

doc/ssl/SSL_SESSION_free.pod

+1 −1
Original line number Diff line number Diff line
@@ -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

doc/ssl/SSL_free.pod

+1 −1
Original line number Diff line number Diff line
@@ -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