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)
commitf788388b46884fb049640a504a0e95238277e1a2
treeaebbf10271e3486923f31b749ece8ee308fb58c1
parent25778fe86b2806f0a179662ad70c9787f92af767
parent5e5950c5e929593b05740aa4173c93c50eac0110
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/firewall

* '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.
local.m4
numbers.m4