From 3ffb6c3cedc0c09981762071b16c6020868a53e8 Mon Sep 17 00:00:00 2001 From: traumschule Date: Wed, 5 Sep 2018 10:01:34 +0200 Subject: [PATCH 1/6] security.txt: remove hiring and signature lines (#27422, #27424) --- .well-known/security.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.well-known/security.txt b/.well-known/security.txt index 9d9af26c..ed88910e 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -2,11 +2,6 @@ Contact: tor-security@lists.torproject.org Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184 Acknowledgments: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy - Policy: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy -Hiring: https://www.torproject.org/about/jobs - Permission: None - # RFC-URL: https://tools.ietf.org/html/draft-foudil-securitytxt-04 -Signature: https://torproject.org/.well-known/security.txt.sig From 9e29feee9cad27de2dd338f94b987d0a0aa963f4 Mon Sep 17 00:00:00 2001 From: traumschule Date: Wed, 5 Sep 2018 10:07:59 +0200 Subject: [PATCH 2/6] security.txt: temporary links for acknowledgments and security policy --- .well-known/security.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.well-known/security.txt b/.well-known/security.txt index ed88910e..00e56d84 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -1,7 +1,7 @@ # https://www.torproject.org/about/contact#security Contact: tor-security@lists.torproject.org Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184 -Acknowledgments: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy -Policy: https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy -Permission: None +Acknowledgments: (in progress) https://torprojects.org/projects/tor/ticket/27458 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27458 +Policy: (in progress) https://torprojects.org/projects/tor/ticket/27421 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27421 +Permission: none # RFC-URL: https://tools.ietf.org/html/draft-foudil-securitytxt-04 From 02c370730a5af956151c533090a3020a65588735 Mon Sep 17 00:00:00 2001 From: traumschule Date: Wed, 5 Sep 2018 10:13:35 +0200 Subject: [PATCH 3/6] contact: correct link to security.txt (#25131) --- about/en/contact.wml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index bfcbc8a5..47f2c41d 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -121,7 +121,8 @@ uid tor-security@lists.torproject.org sub 4096R/C00942E4 2017-03-13 - Find links to acknowledgments and our security policy in machine readable form at https://torproject.org/.well-known/security.txt. + Find links to acknowledgments and our security policy in machine readable + form here.

From 12b283eecd4f467bb05171f3c0616e99051d4dab Mon Sep 17 00:00:00 2001 From: traumschule Date: Thu, 6 Sep 2018 12:19:04 +0200 Subject: [PATCH 4/6] security.txt: mention possible different policies (#25131) --- .well-known/security.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.well-known/security.txt b/.well-known/security.txt index 00e56d84..165d543c 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -2,6 +2,10 @@ Contact: tor-security@lists.torproject.org Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184 Acknowledgments: (in progress) https://torprojects.org/projects/tor/ticket/27458 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27458 -Policy: (in progress) https://torprojects.org/projects/tor/ticket/27421 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27421 +Policy: For tor (the network daemon) see + https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy + Other projects may have their own policies, see also + https://torprojects.org/projects/tor/ticket/27421 + http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27421 Permission: none # RFC-URL: https://tools.ietf.org/html/draft-foudil-securitytxt-04 From 11c24d5dd2a4895c2c34211355d3abdfb7cea294 Mon Sep 17 00:00:00 2001 From: traumschule Date: Thu, 6 Sep 2018 15:17:14 +0200 Subject: [PATCH 5/6] security.txt: fix policy links (#25131) --- .well-known/security.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.well-known/security.txt b/.well-known/security.txt index 165d543c..40225885 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -4,8 +4,9 @@ Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184 Acknowledgments: (in progress) https://torprojects.org/projects/tor/ticket/27458 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27458 Policy: For tor (the network daemon) see https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy + http://ea5faa5po25cf7fb.onion/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy Other projects may have their own policies, see also - https://torprojects.org/projects/tor/ticket/27421 + https://trac.torproject.org/projects/tor/ticket/27421 http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27421 Permission: none # RFC-URL: https://tools.ietf.org/html/draft-foudil-securitytxt-04 From f1c80a46c4ee7c09ce70fbd95328a32d24668279 Mon Sep 17 00:00:00 2001 From: traumschule Date: Mon, 10 Sep 2018 11:08:28 +0200 Subject: [PATCH 6/6] security.txt: add TROVE (#27458) --- .well-known/security.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.well-known/security.txt b/.well-known/security.txt index 40225885..f5a07c3b 100644 --- a/.well-known/security.txt +++ b/.well-known/security.txt @@ -2,6 +2,10 @@ Contact: tor-security@lists.torproject.org Encryption: openpgp4fpr:8B904624C5A28654E4539BC2E135A8B41A7BF184 Acknowledgments: (in progress) https://torprojects.org/projects/tor/ticket/27458 / http://ea5faa5po25cf7fb.onion/projects/tor/ticket/27458 + Core Tor (the network daemon) security issues: + https://trac.torproject.org/projects/tor/wiki/TROVE + http://ea5faa5po25cf7fb.onion/projects/tor/wiki/TROVE + Policy: For tor (the network daemon) see https://trac.torproject.org/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy http://ea5faa5po25cf7fb.onion/projects/tor/wiki/org/teams/NetworkTeam/SecurityPolicy