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

[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 6401d983fed5776c252d6e7c8dd8326c40908214
Merge: 64e6912 b68efc8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 4 22:00:33 2016 +0100

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

 LICENSE                                            | 201 +++++++++++++
 pom.xml                                            | 334 +++++++++++++++++++--
 src/main/c/ssl.c                                   |  45 ++-
 src/main/c/sslcontext.c                            |  54 +++-
 src/main/java/org/apache/tomcat/jni/SSL.java       |  17 ++
 .../java/org/apache/tomcat/jni/SSLContext.java     |  18 ++
 src/main/native-package/m4/tcnative.m4             |   6 +-
 7 files changed, 642 insertions(+), 33 deletions(-)

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