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

diff --cc local.m4
index 8f39161,f139f00..4385223
--- 1/local.m4
--- 2/local.m4
+++ b/local.m4
@@@ -90,9 -90,10 +90,10 @@@ defhost artis
        iface eth1 dmz unsafe
  defhost vampire
        router
-       iface eth0.0 dmz unsafe default
-       iface eth0.1 dmz unsafe default
 -      iface eth0.0 dmz unsafe safe
 -      iface eth0.1 dmz unsafe safe
++      iface eth0.0 dmz unsafe safe default
++      iface eth0.1 dmz unsafe safe default
+       iface eth0.2 safe
 -      iface eth0.3 untrusted
 +      iface eth0.3 untrusted default
        iface dns0 dns
        iface vpn-+ vpn
        iface vpn-precision colobdry vpn