X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Ffaq%2Fcopyright.html;h=9b27c3d324fc559ae98a9af9cccc1489de7ba16b;hp=1a0a7d6e5ac3e72ce68458e853f132e2bba755e9;hb=2d1af75a04189057eb4cf4949908a3cdf9ca2b6e;hpb=78b9ddc7014a3a7d0cc38f7019a695a1c6139dc4 diff --git a/doc/webserver/faq/copyright.html b/doc/webserver/faq/copyright.html index 1a0a7d6e..9b27c3d3 100644 --- a/doc/webserver/faq/copyright.html +++ b/doc/webserver/faq/copyright.html @@ -33,17 +33,22 @@ "APPLICATION">Junkbuster (tm) FAQ, and modified as appropriate for Privoxy.

-

7.1. License

-

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.

+

7.1. License

+

Privoxy is free software; you can 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.

Privoxy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the license for details.

-

7.2. History

+

7.2. History

A long time ago, there was the Internet Junkbuster, by Anonymous Coders and Junkbusters Corporation. This saved many users a lot of pain in the early days of web advertising and user tracking.