~mdw / firewall / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5caa9a4 216285e)
Merge branch 'master' into emergency
authorMark Wooding <mdw@distorted.org.uk>
Sun, 11 Mar 2012 05:23:50 +0000 (05:23 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sun, 11 Mar 2012 05:23:50 +0000 (05:23 +0000)
commitc8dab9d26762658a6ba0b34c5598b589ae2652d3
tree259f97f83b1c6140664e1acee0c435f15905cabatree | snapshot (tar.gz zip)
parent5caa9a42c1968d16a315fafc95297e2338804895commit | diff
parent216285e1f550316101d0c49d4420664a5dc74963commit | diff
Merge branch 'master' into emergency

* master:
  local.m4: Fix the `safe' network prefix length.
  local.m4: Define the IPv6 network structure.
  local.m4: Add routes to/from the `safe' network.
  local.m4: The VPN will be available through the colo.
  functions.m4: Correct defaulting of IPv6 host addresses.

Conflicts:
local.m4
local.m4 diff1 | diff2 | blob | history
Firewall scripts for distorted.org.uk.