Merge branch 'master' of /home/mdw/public-git/firewall

* 'master' of /home/mdw/public-git/firewall:
  vampire: Allow incoming I2P traffic.

diff --combined numbers.m4
index 6738dfc193a0fd84070cd66c072fc9a2aa0f34b5,da3ee59517dd1250db52203633cb6097cd328fa0..18ab0461f6b2a4eb1afb1559cd500986beb2eeba
--- 1/numbers.m4
--- 2/numbers.m4
+++ b/numbers.m4
@@@ -38,7 -38,6 +38,7 @@@ defport ident 11
  defport https 443
  defport syslog 514                    # UDP only!
  defport rsync 873
 +defport imaps 993
  defport squid 3128
  defport tripe 4070
  defport iodine 5353
@@@ -48,6 -47,7 +48,7 @@@ defport mpd 660
  defport tor_public 9001
  defport tor_directory 9030
  defport git 9418
+ defport i2p 16911
  defport disorder 23599
  
  m4_divert(-1)