[Privoxy-commits] [privoxy] 05/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 fd1bd3017b9aaee3632dd10b6ddc6ed9a077dc03
Merge: 7cf0ae9e 7fb2856b
Author: Lee <ler762 at users.sourceforge.net>
AuthorDate: Mon Mar 15 12:55:58 2021 -0400

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

 ChangeLog             | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 GNUmakefile.in        | 37 +++++++------------------------
 TODO                  | 16 +++++++++-----
 configure.in          | 11 +---------
 default.action.master |  4 ++++
 jcc.c                 |  3 ++-
 openssl.c             | 29 +++++++++++++++++-------
 7 files changed, 107 insertions(+), 54 deletions(-)


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