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

[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 07055f4e818757edc66d5c3c591d2944e47e173c
Merge: 7fa796b 3c1c229
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jan 23 08:44:37 2017 +0100

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

 boringssl-static/pom.xml              | 2 +-
 libressl-static/pom.xml               | 2 +-
 openssl-dynamic/pom.xml               | 2 +-
 openssl-dynamic/src/main/c/ssl.c      | 4 ++--
 openssl-dynamic/src/main/c/sslutils.c | 5 +++++
 openssl-static/pom.xml                | 2 +-
 pom.xml                               | 4 ++--
 7 files changed, 13 insertions(+), 8 deletions(-)

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