chiark / gitweb /
~mdw / firewall / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc00515 c68b8ec)
Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Sat, 17 Mar 2012 16:04:22 +0000 (16:04 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 17 Mar 2012 16:04:22 +0000 (16:04 +0000)
commitd8e37f37a3d09961f5bb0ab438e5ed2becba736d
tree655ac3c8a03c0eecab2330701e2816e10cb28172tree | snapshot
parentdc0051506301c0bcaf56081e9404c92dfdb70c7acommit | diff
parentc68b8ecca140f3382431eb3d65ffe6a6ac3ba121commit | diff
Merge branch 'master' into emergency

* master:
  local.m4: Declare network for anycast services.
  local.m4: Reorder forwarding networks for `default'.
  local.m4: Move `vpn' to the common networks section.
local.m4 diff1 | diff2 | blob | history
Firewall scripts for distorted.org.uk.