Merge "openssl 1.1 support: use OPENSSL_VERSION_NUMBER"
authorzuul <zuul@gerrit.asterisk.org>
Tue, 14 Feb 2017 18:33:01 +0000 (12:33 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 14 Feb 2017 18:33:01 +0000 (12:33 -0600)

Trivial merge