From ce4193880860a3662f57b75847459f3bc532de6d Mon Sep 17 00:00:00 2001 From: mia00 Date: Mon, 3 Dec 2018 07:21:21 +0000 Subject: [PATCH 1/4] Update 'LICENSE.md' --- COPYING.CC0 | 5 ----- LICENSE.md | 13 +++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 COPYING.CC0 create mode 100644 LICENSE.md diff --git a/COPYING.CC0 b/COPYING.CC0 deleted file mode 100644 index 5c832fea3..000000000 --- a/COPYING.CC0 +++ /dev/null @@ -1,5 +0,0 @@ -This repository is in the PUBLIC DOMAIN. CC0 - Public Domain. It was created anonymously, in public, for the use of the world to resist cloudflare. - -Contributors who have anonymously so contributed (including in CryptoParty) have since come forward to give this project their blessing. - -The tools directories may have their own license, see each directory to see if it has it's own COPYING/copyright file in it. \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..03bb804bd --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,13 @@ +### License + +* /cloudflare-tor/bcma -- [MIT License](https://notabug.org/themusicgod1/cloudflare-tor/src/master/bcma/LICENSE.txt) +* /cloudflare-tor/globalist -- [GNU GPLv3](https://notabug.org/themusicgod1/cloudflare-tor/src/master/globalist/LICENSE) +* Else -- [PUBLIC DOMAIN (CC0)](https://web.archive.org/web/https://creativecommons.org/share-your-work/public-domain/cc0/) + + +This repository, cloudflare-tor, is in the PUBLIC DOMAIN (CC0). +It was created anonymously, in public, for the use of the world to resist [Cloudflare](https://cloudflare.com/). + +Contributors who have anonymously contributed (including in CryptoParty) have since come forward to give this project their blessing. + +The tools directories may have their own license, see each directory to see if it has it's own COPYING/copyright file in it. \ No newline at end of file From 20cfbd909efbec423bbc89f3daf9010ef91372c8 Mon Sep 17 00:00:00 2001 From: mia00 Date: Mon, 3 Dec 2018 07:22:37 +0000 Subject: [PATCH 2/4] Update 'LICENSE.md' --- LICENSE.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 03bb804bd..86bfd249b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -5,9 +5,7 @@ * Else -- [PUBLIC DOMAIN (CC0)](https://web.archive.org/web/https://creativecommons.org/share-your-work/public-domain/cc0/) -This repository, cloudflare-tor, is in the PUBLIC DOMAIN (CC0). -It was created anonymously, in public, for the use of the world to resist [Cloudflare](https://cloudflare.com/). - -Contributors who have anonymously contributed (including in CryptoParty) have since come forward to give this project their blessing. - -The tools directories may have their own license, see each directory to see if it has it's own COPYING/copyright file in it. \ No newline at end of file +This repository, cloudflare-tor, is in the PUBLIC DOMAIN (CC0). +It was created anonymously, in public, for the use of the world to resist [Cloudflare](https://cloudflare.com/). + +Contributors who have anonymously contributed (including in CryptoParty) have since come forward to give this project their blessing. From f45e3bbb7440a44c8c1424684560f0152c93637b Mon Sep 17 00:00:00 2001 From: mia00 Date: Mon, 3 Dec 2018 07:23:18 +0000 Subject: [PATCH 3/4] Update 'LICENSE.md' --- LICENSE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 86bfd249b..63284d37a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ ### License -* /cloudflare-tor/bcma -- [MIT License](https://notabug.org/themusicgod1/cloudflare-tor/src/master/bcma/LICENSE.txt) -* /cloudflare-tor/globalist -- [GNU GPLv3](https://notabug.org/themusicgod1/cloudflare-tor/src/master/globalist/LICENSE) +* /cloudflare-tor/bcma (Block Cloudflare MITM Attack) -- [MIT License](https://notabug.org/themusicgod1/cloudflare-tor/src/master/bcma/LICENSE.txt) +* /cloudflare-tor/globalist (Globalist) -- [GNU GPLv3](https://notabug.org/themusicgod1/cloudflare-tor/src/master/globalist/LICENSE) * Else -- [PUBLIC DOMAIN (CC0)](https://web.archive.org/web/https://creativecommons.org/share-your-work/public-domain/cc0/) From 5182a63b841bdc934a27999f43d1a5b94db02a44 Mon Sep 17 00:00:00 2001 From: mia00 Date: Mon, 3 Dec 2018 07:24:05 +0000 Subject: [PATCH 4/4] Update 'faq.md' --- faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faq.md b/faq.md index c6d47a238..6e2df61c9 100644 --- a/faq.md +++ b/faq.md @@ -1,6 +1,6 @@ Q) This is a text directory! There's no code here -A) No. Take a look at the /globalist/ folder. +A) [Are you sure?](LICENSE.md) Q) It's inevitabble that Cloudflare is going to take over the web. We can't stop them. Small website providers will be strongarmed into using them via [DDOScoin](https://www.usenix.org/system/files/conference/woot16/woot16-paper-wustrow.pdf) and that's that.