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

[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 1a714db827828bd4b9b61df20f12d602bbd20b49
Merge: e23ee59 40e311a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 10 09:43:55 2015 +0100

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

 pom.xml                                      |   4 +-
 src/main/c/ssl.c                             | 289 +++++++++++++++++++++++----
 src/main/c/sslcontext.c                      |   4 +
 src/main/java/org/apache/tomcat/jni/SSL.java |  15 ++
 4 files changed, 266 insertions(+), 46 deletions(-)

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