[Privoxy-commits] [privoxy] 02/10: Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy

[User Git]

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch master
in repository privoxy.

commit 813fe6f4994413f1feeb4f0a263868e7fa442858
Merge: f329002c 0a92b2ac
Author: Lee <ler762 at users.sourceforge.net>
AuthorDate: Fri Mar 5 18:04:25 2021 -0500

    Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy

 INSTALL                                           |  4 ++--
 README                                            | 25 +++++++++++++++--------
 actions.c                                         |  8 ++++----
 configure.in                                      |  4 ++--
 default.action.master                             |  4 ++++
 doc/source/authors.sgml                           |  8 ++++----
 doc/source/config.sgml                            |  6 +++---
 doc/source/contacting.sgml                        |  4 +++-
 doc/source/developer-manual.sgml                  | 13 ++++++++----
 doc/source/faq.sgml                               | 17 ++++++++-------
 doc/source/install.sgml                           |  8 ++++----
 doc/source/newfeatures.sgml                       |  2 +-
 doc/source/privoxy-man-page.sgml                  |  8 ++++----
 doc/source/readme.sgml                            | 12 +++++------
 doc/source/user-manual.sgml                       |  8 ++++----
 doc/source/webserver/index.sgml                   |  8 ++++----
 doc/webserver/developer-manual/documentation.html |  2 +-
 doc/webserver/developer-manual/index.html         |  2 +-
 doc/webserver/developer-manual/newrelease.html    | 17 ++++++++-------
 doc/webserver/faq/contact.html                    |  1 +
 doc/webserver/faq/general.html                    |  7 +++++--
 doc/webserver/faq/index.html                      |  4 ++--
 doc/webserver/index.html                          |  2 +-
 doc/webserver/privoxy-index.html                  |  2 +-
 doc/webserver/user-manual/actions-file.html       |  4 ++--
 doc/webserver/user-manual/appendix.html           | 20 +++++++++---------
 doc/webserver/user-manual/config.html             |  4 ++--
 doc/webserver/user-manual/configuration.html      | 14 ++++++++-----
 doc/webserver/user-manual/contact.html            |  5 +++--
 doc/webserver/user-manual/copyright.html          |  4 ++--
 doc/webserver/user-manual/filter-file.html        |  4 ++--
 doc/webserver/user-manual/index.html              |  4 ++--
 doc/webserver/user-manual/installation.html       |  8 ++++----
 doc/webserver/user-manual/introduction.html       | 23 +++++++++++++--------
 doc/webserver/user-manual/quickstart.html         |  6 +++---
 doc/webserver/user-manual/seealso.html            |  4 ++--
 doc/webserver/user-manual/startup.html            |  8 ++++----
 doc/webserver/user-manual/templates.html          |  4 ++--
 doc/webserver/user-manual/whatsnew.html           |  4 ++--
 openssl.c                                         |  3 ++-
 ssl.c                                             |  3 ++-
 tools/privoxy-regression-test.pl                  |  2 +-
 urlmatch.c                                        | 20 +++++++++++-------
 43 files changed, 185 insertions(+), 135 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.