Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
Zhi Guan
2017-02-14 16:12:29 +08:00
parent d2254170b8
commit 43fed1108d
3503 changed files with 320546 additions and 408546 deletions

View File

@@ -29,10 +29,15 @@ implies that the stack became empty, otherwise 1.
=head1 SEE ALSO
L<err(3)|err(3)>
L<err(3)>
=head1 HISTORY
=head1 COPYRIGHT
ERR_set_mark() and ERR_pop_to_mark() were added in OpenSSL 0.9.8.
Copyright 2003-2016 The OpenSSL Project Authors. All Rights Reserved.
Licensed under the OpenSSL license (the "License"). You may not use
this file except in compliance with the License. You can obtain a copy
in the file LICENSE in the source distribution or at
L<https://www.openssl.org/source/license.html>.
=cut