Merge branch 'master' into emergency
* master:
functions.m4: Write the netclass ids to the trace output.
bookends.m4: If debugging, dump the final tables.
Determine forwarding and reverse-path filtering from host definitions.
Overhaul address classification.
local.m4: Promote the NTP server configuration to a proper variable.
Renumber the diversions.
fixup! WIP on emergency:
7a108d1 Makefile: New target for tracking diversions.
Makefile: New target for tracking diversions.
Makefile, base.m4: Inject the target hostname into the generated script.
Semantic conflict: The variable `if_dmz' is no longer set, so just
hardwire the interface name.