Merge branch 'master' of ssh://git.privoxy.org:23/git/privoxy
authorLee <ler762@users.sourceforge.net>
Fri, 14 Dec 2018 03:15:43 +0000 (22:15 -0500)
committerLee <ler762@users.sourceforge.net>
Fri, 14 Dec 2018 03:15:43 +0000 (22:15 -0500)

Trivial merge