Merge "OpenSSL 1.1.0 support"
authorzuul <zuul@gerrit.asterisk.org>
Thu, 1 Dec 2016 05:26:46 +0000 (23:26 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 1 Dec 2016 05:26:46 +0000 (23:26 -0600)

Trivial merge