[netty-tcnative] 03/04: Merge tag 'upstream/1.1.33.Fork21'

[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 0f33f6d770b8688241a2a40a348173f1213be6c1
Merge: ec3ce0b b16f830
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 30 00:58:32 2016 +0200

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

 boringssl-static/pom.xml                           |   2 +-
 libressl-static/pom.xml                            |  64 +++------
 openssl-dynamic/pom.xml                            |   2 +-
 openssl-dynamic/src/main/c/jnilib.c                |  32 ++++-
 openssl-dynamic/src/main/c/ssl.c                   | 143 +++++++++++++++++++--
 openssl-dynamic/src/main/c/ssl_private.h           |   2 +
 openssl-dynamic/src/main/c/sslcontext.c            |  77 +++++++----
 openssl-dynamic/src/main/c/sslutils.c              |  32 ++++-
 openssl-dynamic/src/main/c/tcn.h                   |   8 ++
 openssl-dynamic/src/main/c/tcn_api.h               |   4 +
 .../tomcat/jni/CertificateRequestedCallback.java   |  37 +++++-
 .../src/main/java/org/apache/tomcat/jni/SSL.java   |  34 +++++
 openssl-static/pom.xml                             |   2 +-
 pom.xml                                            |  12 +-
 14 files changed, 344 insertions(+), 107 deletions(-)

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