Browse code

Merge branch 'securitytxt'

hiro authored on 11/09/2018 18:27:18
Showing 2 changed files
... ...
@@ -1,12 +1,16 @@
1 1
 # https://www.torproject.org/about/contact#security
2 2
 Contact: tor-security@lists.torproject.org
3 3
 Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184
4
-Acknowledgments: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy
5
-
6
-Policy: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy
7
-Hiring: https://www.torproject.org/about/jobs
8
-
9
-Permission: None
4
+Acknowledgments: (in progress) https://torprojects.org/projects/tor/ticket/27458 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27458
5
+                 Core Tor (the network daemon) security issues:
6
+                 https://trac.torproject.org/projects/tor/wiki/TROVE
7
+                 http://ea5faa5po25cf7fb.onion/projects/tor/wiki/TROVE
10 8
 
9
+Policy: For tor (the network daemon) see
10
+        https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy
11
+        http://ea5faa5po25cf7fb.onion/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy
12
+        Other projects may have their own policies, see also
13
+        https://trac.torproject.org/projects/tor/ticket/27421
14
+        http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27421
15
+Permission: none
11 16
 # RFC-URL: https://tools.ietf.org/html/draft-foudil-securitytxt-04
12
-Signature: https://torproject.org/.well-known/security.txt.sig
... ...
@@ -121,7 +121,8 @@ uid                  tor-security@lists.torproject.org <tor-security-owner@lists
121 121
 uid                  tor-security@lists.torproject.org <tor-security-request@lists.torproject.org>
122 122
 sub   4096R/C00942E4 2017-03-13
123 123
 </pre></blockquote>
124
-    Find links to <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy">acknowledgments and our security policy</a> in machine readable form at <a href="">https://torproject.org/.well-known/security.txt</a>.
124
+    Find links to acknowledgments and our security policy in machine readable
125
+    form <a href="https://www.torproject.org/.well-known/security.txt">here</a>.
125 126
     </p>
126 127
 
127 128
     <a id="badrelays"></a>