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.

diff --combined local.m4
index b3c5009,760391a..c0874c5
--- 1/local.m4
--- 2/local.m4
+++ b/local.m4
@@@ -27,7 -27,7 +27,7 @@@
  m4_divert(6)m4_dnl
  ## Default NTP servers.
  defconf(ntp_servers,
-       "158.152.1.76 158.152.1.204 194.159.253.2 195.173.57.232")
+       "81.187.26.174 90.155.23.205 2001:8b0:0:23::205 185.73.44.6 2001:ba8:0:2c06::")
  
  m4_divert(-1)
  ###--------------------------------------------------------------------------
@@@ -224,7 -224,6 +224,7 @@@ defhost precisio
        iface vpn-radius housebdry vpn sgo
        iface vpn-chiark sgo
        iface vpn-national upn
 +      iface vpn-mdwdev upn
        iface vpn-+ vpn
  defhost telecaster
        iface eth0 jump colo
@@@ -271,7 -270,6 +271,7 @@@ defnet upn untruste
        addr 172.29.198.160/27 2001:ba8:1d9:a000::/64
        via colohub
        host national 1 ::1:1
 +      host mdwdev 2 ::2:1
  
  ## Linode hosts.
  defhost national

diff --combined numbers.m4
index 4dbaf86,0634f9e..456ff84
--- 1/numbers.m4
--- 2/numbers.m4
+++ b/numbers.m4
@@@ -62,12 -62,12 +62,13 @@@ defport postgresql 543
  defport gnutella_svc 6346
  defport mpd 6600
  defport irc 6667
+ defport privoxy 8118
  defport tor_public 9001
  defport tor_directory 9030
  defport git 9418
  defport pgp_keys 11371
  defport i2p 16911
 +defport disorder2 23598
  defport disorder 23599
  defport udpkey 59274