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

[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 ed502cfdbcc3f8e1038fd09172a38c9555a20687
Merge: 514c3ce eb0aab3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jan 1 01:54:23 2017 +0100

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

 boringssl-static/pom.xml                           |  2 +-
 libressl-static/pom.xml                            |  2 +-
 openssl-dynamic/pom.xml                            |  2 +-
 openssl-dynamic/src/main/c/ssl.c                   | 20 ++++++---
 openssl-dynamic/src/main/c/ssl_private.h           |  8 ++--
 openssl-dynamic/src/main/c/sslcontext.c            | 23 +++++++++-
 openssl-dynamic/src/main/c/sslutils.c              | 49 +++++++++++++++-------
 .../src/main/java/org/apache/tomcat/jni/SSL.java   | 23 +++++++---
 .../java/org/apache/tomcat/jni/SSLContext.java     | 16 +++++++
 openssl-static/pom.xml                             |  2 +-
 pom.xml                                            |  4 +-
 11 files changed, 115 insertions(+), 36 deletions(-)

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