[Privoxy-commits] [privoxy] 02/05: 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 0c1d292cb4ffa59843241089b0577fac1785d7b0
Merge: 23579057 3bc4eac3
Author: Lee <ler762 at users.sourceforge.net>
AuthorDate: Sat Oct 26 13:23:33 2024 -0400

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

 GNUmakefile.in                           |  11 +-
 TODO                                     |   4 -
 configure.in                             |   4 +-
 debian/apparmor/usr.sbin.privoxy         |   2 +
 debian/changelog                         |  38 +++++-
 debian/control                           |   4 +-
 debian/copyright                         | 100 ++++++++++++---
 debian/rules                             |  19 ++-
 debian/salsa-ci.yml                      |   4 +-
 debian/tests/check-ssl                   | 138 +++++++++++++++++++++
 debian/tests/control                     |   6 +-
 debian/tests/privoxy-regression-test     |  18 ++-
 default.action.master                    |  12 +-
 doc/source/p-authors.sgml                |   1 +
 doc/source/user-manual.sgml              | 106 ++++++++--------
 doc/source/webserver/index.sgml          |   2 +-
 doc/webserver/sponsors/index.html        |   5 +-
 doc/webserver/user-manual/appendix.html  |  16 +--
 doc/webserver/user-manual/copyright.html |  10 +-
 doc/webserver/user-manual/howto.html     |  83 +++++++------
 errlog.c                                 |  13 +-
 filters.c                                |  24 +++-
 gateway.c                                |   1 +
 openssl.c                                |  40 +++---
 parsers.c                                |   7 +-
 project.h                                |   2 +-
 ssl.c                                    |  39 ++----
 ssl_common.c                             |  37 +++++-
 ssl_common.h                             |   1 +
 tools/privoxy-regression-test.pl         |  15 ++-
 tools/uagen.pl                           |   4 +-
 wolfssl.c                                | 207 ++++++++++++++-----------------
 32 files changed, 630 insertions(+), 343 deletions(-)

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