X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy.1;h=1073f56f26a3cab0844d75e5e6d24e943a4db52b;hp=22b6065dceba998b97782633055458a2fb24ab4a;hb=567f181b6aeee7c03aa8873cfdb3f1671ae05052;hpb=af72dbef755cd04a38563229570103f4edaac50c

diff --git a/privoxy.1 b/privoxy.1
index 22b6065d..1073f56f 100644
--- a/privoxy.1
+++ b/privoxy.1
@@ -1,6 +1,6 @@
 .\" This manpage has been generated by docbook2man-spec.pl
 .\" (included in the Privoxy source tarball) from a DocBook document.
-.TH "PRIVOXY" "1" "30 December 2018" "Privoxy 3.0.28" ""
+.TH "PRIVOXY" "1" "30 November 2020" "Privoxy 3.0.29" ""
 .SH NAME
 privoxy \- Privacy Enhancing Proxy
 .SH SYNOPSIS
@@ -76,7 +76,7 @@ access, and removing ads and other obnoxious Internet junk. Privoxy has a
 flexible configuration and can be customized to suit individual needs and tastes.
 It has application for both stand-alone systems and multi-user networks.
 .PP
-Privoxy is Free Software and licensed under the GNU GPLv2.
+Privoxy is Free Software and licensed under the GNU GPLv2 or later.
 .PP
 Privoxy is an associated project of Software in the Public Interest (SPI).
 .PP
@@ -210,7 +210,7 @@ configuration related suggestions to the developers.
 .SH "COPYRIGHT AND LICENSE"
 .SS "COPYRIGHT"
 .PP
-Copyright (C) 2001-2018 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
+Copyright (C) 2001-2020 by Privoxy Developers <privoxy-devel@lists.privoxy.org>
 .PP
 Some source code is based on code Copyright (C) 1997 by Anonymous Coders
 and Junkbusters, Inc. and licensed under the \fIGNU General Public
@@ -218,9 +218,19 @@ License\fR.
 .SS "LICENSE"
 .PP
 \fBPrivoxy\fR is free software; you can
-redistribute it and/or modify it under the terms of the
-\fIGNU General Public License\fR, version 2,
-as published by the Free Software Foundation.
+redistribute and/or modify its source code under the terms
+of the \fIGNU General Public License\fR
+as published by the Free Software Foundation, either version 2
+of the license, or (at your option) any later version.
+.PP
+The same is true for \fBPrivoxy\fR 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 \fBPrivoxy\fR
+binaries under the terms of the \fIGNU General Public License\fR
+as published by the Free Software Foundation, either version 3
+of the license, or (at your option) any later version.
 .PP
 \fBPrivoxy\fR is distributed in the hope that
 it will be useful, but WITHOUT ANY WARRANTY; without even the implied