Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/firewall
authorMark Wooding <mdw@distorted.org.uk>
Mon, 9 May 2022 22:24:19 +0000 (23:24 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 9 May 2022 22:24:19 +0000 (23:24 +0100)
* 'master' of git.distorted.org.uk:~mdw/publish/public-git/firewall:
  jazz.m4, numbers.m4: Allow Privoxy access to SGO VPN.
  local.m4: Update external NTP servers.

1  2 
local.m4
numbers.m4

diff --cc local.m4
Simple merge
diff --cc numbers.m4
Simple merge