diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-01-15 12:38:43 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-01-15 12:38:43 -0500 |
commit | d807c7c8725acb85a6695ab399f99c2509a245c4 (patch) | |
tree | dcd47ab1906e9fb9b10f04699b07175e71add82f /changes | |
parent | 3368b0c9f29bad67a85ec70cbcedb69cf85f103b (diff) | |
parent | 746bb55851433a0709e277ea3e1838d0d9b77d9c (diff) | |
download | tor-d807c7c8725acb85a6695ab399f99c2509a245c4.tar.gz tor-d807c7c8725acb85a6695ab399f99c2509a245c4.zip |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug14220 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug14220 b/changes/bug14220 new file mode 100644 index 0000000000..51cfa502bc --- /dev/null +++ b/changes/bug14220 @@ -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. |