From: Fabian Keil Date: Thu, 5 Nov 2020 11:19:06 +0000 (+0100) Subject: Complicate the license explanation even further X-Git-Tag: v_3_0_29~36 X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=920990b6c085dce841d9ada825dbb0e0a65b4b56;p=privoxy.git Complicate the license explanation even further The GPLv3 only has to be used if the MbedTLS version is licensed under the Apache 2.0 license which will be the case for future releases. At the moment the 2.16 releases are still dual licensed. --- diff --git a/doc/source/license.sgml b/doc/source/license.sgml index 57f9f1f3..60157481 100644 --- a/doc/source/license.sgml +++ b/doc/source/license.sgml @@ -33,10 +33,11 @@ The same is true for Privoxy binaries - unless they are linked with - mbed TLS in which - case you can redistribute them and/or modify them under the terms - of the GNU General Public License + unless they are linked with a + mbed TLS version + that is licensed under the Apache 2.0 license in which + case you can redistribute and/or modify the Privoxy + binaries under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the license, or (at your option) any later version. diff --git a/doc/source/user-manual.sgml b/doc/source/user-manual.sgml index 886a2006..344fbd65 100644 --- a/doc/source/user-manual.sgml +++ b/doc/source/user-manual.sgml @@ -7851,10 +7851,11 @@ Requests The same is true for Privoxy binaries - unless they are linked with - mbed TLS in which - case you can redistribute them and/or modify them under the terms - of the GNU General Public License + unless they are linked with a + mbed TLS version + that is licensed under the Apache 2.0 license in which + case you can redistribute and/or modify the Privoxy + binaries under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the license, or (at your option) any later version.