X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fsource%2Flicense.sgml;h=601574810c34e65610c2d7dfbb052e92c3b5122a;hb=3faadc6490219a0db4d617918145d540e4affb98;hp=351e06f13673179e44dba81426ae981701f7916d;hpb=7ecdaff4e6e989eaa70d1ffec88c0e5dfbeb19bb;p=privoxy.git diff --git a/doc/source/license.sgml b/doc/source/license.sgml index 351e06f1..60157481 100644 --- a/doc/source/license.sgml +++ b/doc/source/license.sgml @@ -3,7 +3,7 @@ Purpose : Entity included in other project documents. - Copyright (C) 2001-2018 the Privoxy Developers https://www.privoxy.org/ + Copyright (C) 2001-2020 the Privoxy Developers https://www.privoxy.org/ See LICENSE. ====================================================================== @@ -25,9 +25,21 @@ Privoxy is free software; you can - redistribute it and/or modify it under the terms of the - GNU General Public License, version 2, - as published by the Free Software Foundation. + redistribute and/or modify its source code under the terms + of the GNU General Public License + as published by the Free Software Foundation, either version 2 + of the license, or (at your option) any later version. + + + + The same is true for Privoxy binaries + 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. @@ -38,4 +50,3 @@ url="https://www.privoxy.org/user-manual/copyright.html#LICENSE"> license for details. -