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

[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 20630fc7a0f68194db2a754da61f457cf5b7f525
Merge: 83789d9 b569117
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 5 10:03:32 2015 +0200

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

 pom.xml                                            | 33 +++++++--
 src/main/c/ssl.c                                   | 79 +++++++++++++++++-----
 src/main/c/sslcontext.c                            | 58 +++++++---------
 src/main/c/sslutils.c                              | 16 ++---
 src/main/java/org/apache/tomcat/jni/SSL.java       | 18 +++++
 .../java/org/apache/tomcat/jni/SSLContext.java     | 13 +++-
 src/main/native-package/configure.ac               |  2 +-
 7 files changed, 153 insertions(+), 66 deletions(-)

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