[netty-tcnative] 02/03: Merge tag 'upstream/1.1.33.Fork6'

[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 1feb6e90836df981f32682995b70c43dd8d81242
Merge: 6037b9f a3062f8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 6 22:53:39 2015 +0200

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

 pom.xml                                            |   6 +-
 src/main/c/ssl.c                                   |  39 ++++-
 src/main/c/ssl_private.h                           |   1 +
 src/main/c/sslcontext.c                            | 166 ++++++++++++++++++++-
 src/main/c/sslutils.c                              |  31 ++--
 src/main/java/org/apache/tomcat/jni/SSL.java       |   8 +-
 .../java/org/apache/tomcat/jni/SSLContext.java     |  46 ++++++
 7 files changed, 280 insertions(+), 17 deletions(-)

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