Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
authorLee <ler762@users.sourceforge.net>
Tue, 23 Oct 2018 03:00:43 +0000 (23:00 -0400)
committerLee <ler762@users.sourceforge.net>
Tue, 23 Oct 2018 03:00:43 +0000 (23:00 -0400)
unable to do a push - allarently i have to pull first


Trivial merge