From: Joshua Colp <jcolp@digium.com>
Date: Fri, 22 Jul 2016 16:50:59 +0000 (-0500)
Subject: Merge "res_srtp: Enable AES-256 and AES-GCM." into 14
X-Git-Tag: 14.0.0-beta1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=804c3e6b9edaea2c9bf1882089192eacd2f97418;p=thirdparty%2Fasterisk.git

Merge "res_srtp: Enable AES-256 and AES-GCM." into 14
---

804c3e6b9edaea2c9bf1882089192eacd2f97418