X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Fcopyright.html;h=29b114ab180cb7728e0d19194642d218b7d7c378;hp=e4390b395b1cadc6c9e3835e1e5e4bc00ada73c5;hb=9007b0431a9db86aa01b2b55b240e0196dd85285;hpb=d3b06db58b5fda40bcfba4ec983d17a6a57814a6 diff --git a/doc/webserver/user-manual/copyright.html b/doc/webserver/user-manual/copyright.html index e4390b39..29b114ab 100644 --- a/doc/webserver/user-manual/copyright.html +++ b/doc/webserver/user-manual/copyright.html @@ -4,7 +4,7 @@ Privoxy Copyright, License and History - + @@ -15,7 +15,7 @@
- + @@ -29,15 +29,15 @@

12. Privoxy Copyright, License and History

Copyright © 2001-2020 by Privoxy Developers

-

Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. and licensed - under the GNU General Public License.

+

Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc.

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 mbed TLS in which case you can redistribute them and/or modify them 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.

+

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.

Both licenses are included in the next section.

12.1. License

@@ -1084,7 +1084,7 @@ Public License instead of this License. But first, please read autonomy over their browsing, and for tracking them, keeps evolving. Unfortunately, the Internet Junkbuster did not. Version 2.0.2, published in 1998, was the last official release, available from Junkbusters Corporation. Fortunately, it had been released under the GNU GPL, which allowed further development + "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">GPL, which allowed further development by others.

So Stefan Waldherr started maintaining an improved version of the software, to which eventually a number of people contributed patches. It could already replace banners with a transparent image, and had a first version of @@ -1138,6 +1138,9 @@ Public License instead of this License. But first, please read or contributed in some other way. These include (in alphabetical order):

 Rustam Abdullaev
 Clint Adams
+  Andrew
+  Adriaan
+  Davide Alberani
 Maxim Antonov
 Anatoly Arzhnikov
 Ken Arromdee
@@ -1149,6 +1152,8 @@ Public License instead of this License. But first, please read  Gergely Bor
 Francois Botha
 Reiner Buehl
+  Burberry
+  Calestyo
 Andrew J. Caines
 Clifford Caoile
 Edward Carrel
@@ -1159,17 +1164,22 @@ Public License instead of this License. But first, please read  Billy Crook
 Frédéric Crozat
 Matthew Daley
+  David
 Michael T. Davis
 Markus Dittrich
 Mattes Dolak
 Matthias Drochner
+  Duc
+  Duncan
 Peter E.
 Florian Effenberger
 Markus Elfring
 Ryan Farmer
 Matthew Fischer
+  T Ford
 Dean Gaudet
 Stephen Gildea
+  Morton A. Goldberg
 John McGowan
 Danny Goossen
 Lizik Grelier
@@ -1180,6 +1190,7 @@ Public License instead of this License. But first, please read  Tim H.
 Aaron Hamid
 Darel Henman
+  Mathias Homann
 Magnus Holmgren
 Eric M. Hopper
 Ralf Horstmann
@@ -1193,7 +1204,11 @@ Public License instead of this License. But first, please read  Julien Joubert
 Ralf Jungblut
 Petr Kadlec
+  Kacperdominik
+  Karsten
+  Kevin
 Robert Klemme
+  Max Khon
 Steven Kolins
 Korda
 Stefan Kurtz
@@ -1202,6 +1217,7 @@ Public License instead of this License. But first, please read  Bert van Leeuwen
 Don Libes
 Paul Lieverse
+  Adele Lime
 Han Liu
 Toby Lyward
 Wil Mahan
@@ -1209,45 +1225,66 @@ Public License instead of this License. But first, please read  Raphael Marichez
 Francois Marier
 Angelina Matson
+  Maynard
 Jonathan McKenzie
 David Mediavilla
 Raphael Moll
 J. Momberger
+  Peter Müller
 Mathew Murphy
 Amuro Namie
 Mark Nelson
+  Nettozahler
 Tobias Netzel
+  Omniture
+  Oliver
 John Palkovic
+  Patrick
 Adam Piggott
 Petr Písar
+  Pribog
 Dan Price
+  Pwhk
 Roberto Ragusa
+  Rakista
 Félix Rauch
 Kai Raven
 Marvin Renich
+  Black Rider
 Chris John Riley
 Maynard Riley
 Ivan Romanov
 Andreas Rutkauskas
 Sam
+  Saperski
 Bart Schelstraete
 Gregory Seidman
 Atman Sense
+  Mark Seward
+  Franz Schwartau
 Chung-chieh Shan
 Johan Sintorn
 Benjamin C. Wiley Sittler
 DRS David Soft
 Simon South
 Dan Stahlke
+  Stefan
 Oliver Stoeneberg
 Václav Švec
+  Endre Szabo
 Rick Sykes
+  Szotsaki
 Spinor S.
+  Tceverling
 Peter Thoenen
 Marc Thomas
 Martin Thomas
 Reuben Thomas
 Guybrush Threepwood
+  Tyrexionibus
+  Sam
+  Sam Varshavchik
+  Vaeinoe
 Joel Verhagen
 Bobby G. Vinyard
 Jochen Voss
@@ -1259,11 +1296,15 @@ Public License instead of this License. But first, please read  Anduin Withers
 withoutname
 Eduard Wulff
+  Leo Wzukw
+  Wyrex
 Yang Xia
 Jarry Xu
 Oliver Yeoh
 Yossi Zahn
-  Jamie Zawinski

+  Jamie Zawinski
+  Zepard
+  Radoslaw Zielinski

Privoxy is based in part on code originally developed by Junkbusters Corp. and Anonymous Coders.

Privoxy heavily relies on Philip Hazel's PCRE.

The code to filter compressed content makes use of zlib which is written by Jean-loup Gailly and Mark

Privoxy 3.0.29 User ManualPrivoxy 3.0.30 User Manual
Prev