[netty-tcnative] 04/05: Merge tag 'upstream/1.1.33.Fork19'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty-tcnative.

commit 87e5210053027f1904e59462b9a35b3d040121f5
Merge: 7e799a8 43ae34c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jul 16 23:43:00 2016 +0200

    Merge tag 'upstream/1.1.33.Fork19'
    
    Upstream version 1.1.33.Fork19

 boringssl-static/pom.xml                           |   7 +-
 libressl-static/pom.xml                            |   3 +-
 openssl-dynamic/pom.xml                            |   2 +-
 openssl-dynamic/src/main/c/jnilib.c                |  27 +-
 openssl-dynamic/src/main/c/ssl.c                   | 139 ++++++-
 openssl-dynamic/src/main/c/ssl_private.h           |  35 +-
 openssl-dynamic/src/main/c/sslcontext.c            | 463 +++++++++++++--------
 openssl-dynamic/src/main/c/sslutils.c              | 195 ++++++++-
 .../tomcat/jni/CertificateRequestedCallback.java   |  36 ++
 .../org/apache/tomcat/jni/CertificateVerifier.java |   5 +
 .../src/main/java/org/apache/tomcat/jni/SSL.java   |  48 +++
 .../java/org/apache/tomcat/jni/SSLContext.java     |  42 +-
 .../src/main/native-package/m4/tcnative.m4         |   2 +-
 .../src/main/native-package/vs2010.vcxproj         |  10 +-
 openssl-static/pom.xml                             |   3 +-
 pom.xml                                            |  51 ++-
 vs2010.vcxproj.static.template                     |  22 +-
 17 files changed, 868 insertions(+), 222 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git