Commit e01d0f10 authored by Tony Kelman's avatar Tony Kelman Committed by Daniel Stenberg
Browse files

LICENSE-MIXING.md: update with mbedTLS dual licensing 

Recent versions of mbedTLS are available under either Apache 2.0 or GPL
2.0, see https://tls.mbed.org/how-to-get

Closes #1019
parent 710f0572

docs/LICENSE-MIXING.md

+5 −2
Changes for docs/LICENSE-MIXING.md: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -63,8 +63,11 @@ not have the announcement clause that collides with GPL. 


## mbedTLS



 (May be used for SSL/TLS support) Uses the GPL license or a propietary

 license. If this is a problem for you, consider using another TLS library.

 (May be used for SSL/TLS support) Uses the [Apache 2.0

 license](https://opensource.org/licenses/Apache-2.0) or the GPL license.

 You may choose to license the code under Apache 2.0 terms or GPL terms.

 These licenses grant you different permissions and impose different

 obligations. You should select the license that best meets your needs.



## BoringSSL