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

[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 5dd2864d9e7e3e9f641d17024e60a73229bf65c7
Merge: b42c53c 5687268
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 19 09:47:25 2016 +0200

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

 boringssl-static/pom.xml                |  2 +-
 libressl-static/pom.xml                 |  2 +-
 openssl-dynamic/pom.xml                 |  2 +-
 openssl-dynamic/src/main/c/sslcontext.c | 30 ++++++++++++++++++++++--------
 openssl-static/pom.xml                  |  2 +-
 pom.xml                                 |  4 ++--
 6 files changed, 28 insertions(+), 14 deletions(-)

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