From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 27 Apr 2010 15:25:53 +0000 (+0100)
Subject: Merge branch 'master' of /home/mdw/public-git/firewall
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/firewall/commitdiff_plain/2ee3987faf2592f75b0af917e8771d23de5286b7?hp=-c

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

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

2ee3987faf2592f75b0af917e8771d23de5286b7
diff --combined numbers.m4
index 6738dfc,da3ee59..18ab046
--- a/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)