Merge remote-tracking branch 'origin/maint-0.2.5'

This commit is contained in:
Nick Mathewson 2015-01-15 12:38:43 -05:00
commit d807c7c872

4
changes/bug14220 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (compilation):
- Build without warnings with the stock OpenSSL srtp.h header,
which has a duplicate declaration of SSL_get_selected_srtp_profile().
Fixes bug 14220; this is OpenSSL's bug, not ours.