[tor-commits] [webwml/staging] Merge branch 'securitytxt'

[hiro at torproject.org]

commit 8c3248241dab2b889b85ec586e84b37239520ccc
Merge: 6d3033ab f1c80a46
Author: hiro <hiro at torproject.org>
Date:   Tue Sep 11 18:27:18 2018 +0200

    Merge branch 'securitytxt'

 .well-known/security.txt | 18 +++++++++++-------
 about/en/contact.wml     |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)