doc/threat.html: contacts learn about revocations
Support merged acks.

ACKs can now be merged with other, pending messages to the same contact.
(Including other ACKs themselves.)
Merge branch 'leif-threat-model'
Merge branch 'master' of https://github.com/agl/pond