threat model: two more things contacts can do
Merge branch 'leif-threat-model'