Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
authorLee <ler762@users.sourceforge.net>
Sun, 16 Dec 2018 23:58:50 +0000 (18:58 -0500)
committerLee <ler762@users.sourceforge.net>
Sun, 16 Dec 2018 23:58:50 +0000 (18:58 -0500)

Trivial merge