[netty-tcnative] 01/02: Merge tag 'upstream/1.1.33.Fork24'

[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 b6cbfa880ba4f31868b83006bcc487c394350e3d
Merge: 33193b1 79648a5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Dec 15 13:09:58 2016 +0100

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

 boringssl-static/pom.xml                           |   2 +-
 libressl-static/pom.xml                            |   2 +-
 openssl-dynamic/pom.xml                            |   2 +-
 openssl-dynamic/src/main/c/ssl.c                   | 210 +++++++++++++++------
 openssl-dynamic/src/main/c/ssl_private.h           |  18 ++
 openssl-dynamic/src/main/c/sslcontext.c            |   1 -
 .../src/main/java/org/apache/tomcat/jni/SSL.java   |  23 ++-
 .../src/main/native-package/configure.ac           |   2 +-
 openssl-static/pom.xml                             |   2 +-
 pom.xml                                            |  12 +-
 10 files changed, 200 insertions(+), 74 deletions(-)

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