Merge branch 'master' of mia07/cloudflare-tor into master

README.md

@@ -25,9 +25,10 @@ Do you really want to share your data with Cloudflare, and also 3-letter agency?
 ![](image/dhssaid.jpg)
 
 
-Cloudflare also offer FREE VPN service called "[Cloudflare Warp](https://blog.cloudflare.com/1111-warp-better-vpn/)". If you use it, all your smartphone connections are sent to Cloudflare servers. Cloudflare can know which website you've read, talked with who, etc. You are voluntary giving your information to Cloudflare. If you think "_Are you joking? Cloudflare is secure._" then you need to learn how [VPN works](https://en.wikipedia.org/wiki/VPN).
+Cloudflare also offer FREE VPN service called "[Cloudflare Warp](https://blog.cloudflare.com/1111-warp-better-vpn/)". If you use it, all your smartphone connections are sent to Cloudflare servers. Cloudflare can know which website you've read, what comment you've posted, who you've talked to, etc. You are voluntary giving [all your information](https://github.com/privacytoolsIO/privacytools.io/issues/374#issuecomment-478686469) to Cloudflare. If you think "_Are you joking? Cloudflare is secure._" then you need to learn how [VPN works](https://en.wikipedia.org/wiki/VPN).
 
-## Cloudflare is a honeypot. Cloudflared websites are dangerous.
+
+### Cloudflare is a honeypot. Cloudflared websites are dangerous.
 
 ---
 
@@ -43,6 +44,8 @@ Information
 * [Block Global Active Adversary Cloudflare](https://trac.torproject.org/projects/tor/ticket/24351) by nym-zone
 * [Problem with CloudFlare](https://github.com/privacytoolsIO/privacytools.io/issues/374#issuecomment-460077544) by libBletchley
 * [Criticism and controversies](https://en.wikipedia.org/wiki/Cloudflare#Criticism_and_controversies) by Wikipedia
+* [Cloudflare's Advertisement is just wrong](https://notabug.org/themusicgod1/cloudflare-tor/issues/123)
+
 
 There are more details of why what they are doing is wrong available [here](cloudflare-philosophy.md).
 Also see [Frequently Asked Questions](faq.md).

cloudflare_owned_NS.txt

@@ -18,6 +18,7 @@ amber.ns.cloudflare.com
 amir.ns.cloudflare.com
 amy.ns.cloudflare.com
 andy.ns.cloudflare.com
+angela.ns.cloudflare.com
 anirban.ns.cloudflare.com
 anna.ns.cloudflare.com
 anuj.ns.cloudflare.com
@@ -28,7 +29,9 @@ aragorn.ns.cloudflare.com
 arch.ns.cloudflare.com
 aria.ns.cloudflare.com
 arnold.ns.cloudflare.com
+aron.ns.cloudflare.com
 art.ns.cloudflare.com
+arya.ns.cloudflare.com
 asa.ns.cloudflare.com
 ashley.ns.cloudflare.com
 athena.ns.cloudflare.com
@@ -49,10 +52,13 @@ boyd.ns.cloudflare.com
 brad.ns.cloudflare.com
 brenda.ns.cloudflare.com
 brett.ns.cloudflare.com
+brianna.ns.cloudflare.com
 brit.ns.cloudflare.com
+buck.ns.cloudflare.com
 burt.ns.cloudflare.com
 candy.ns.cloudflare.com
 carl.ns.cloudflare.com
+carol.ns.cloudflare.com
 carter.ns.cloudflare.com
 cash.ns.cloudflare.com
 cass.ns.cloudflare.com
@@ -61,16 +67,21 @@ chan.ns.cloudflare.com
 charles.ns.cloudflare.com
 cheryl.ns.cloudflare.com
 chip.ns.cloudflare.com
+chloe.ns.cloudflare.com
+chris.ns.cloudflare.com
 chuck.ns.cloudflare.com
+clark.ns.cloudflare.com
 clay.ns.cloudflare.com
 cleo.ns.cloudflare.com
 clint.ns.cloudflare.com
 cloe.ns.cloudflare.com
+clyde.ns.cloudflare.com
 coby.ns.cloudflare.com
 coco.ns.cloudflare.com
 cody.ns.cloudflare.com
 connie.ns.cloudflare.com
 cory.ns.cloudflare.com
+cruz.ns.cloudflare.com
 curt.ns.cloudflare.com
 dahlia.ns.cloudflare.com
 daisy.ns.cloudflare.com
@@ -84,6 +95,7 @@ darl.ns.cloudflare.com
 darwin.ns.cloudflare.com
 david.ns.cloudflare.com
 dawn.ns.cloudflare.com
+dean.ns.cloudflare.com
 deb.ns.cloudflare.com
 dee.ns.cloudflare.com
 dell.ns.cloudflare.com
@@ -105,11 +117,13 @@ duke.ns.cloudflare.com
 earl.ns.cloudflare.com
 ed.ns.cloudflare.com
 edna.ns.cloudflare.com
+elaine.ns.cloudflare.com
 elinore.ns.cloudflare.com
 elle.ns.cloudflare.com
 elma.ns.cloudflare.com
 elmo.ns.cloudflare.com
 elsa.ns.cloudflare.com
+emily.ns.cloudflare.com
 emma.ns.cloudflare.com
 eric.ns.cloudflare.com
 erin.ns.cloudflare.com
@@ -124,6 +138,8 @@ fred.ns.cloudflare.com
 gabe.ns.cloudflare.com
 gail.ns.cloudflare.com
 gene.ns.cloudflare.com
+george.ns.cloudflare.com
+gerald.ns.cloudflare.com
 gina.ns.cloudflare.com
 glen.ns.cloudflare.com
 gordon.ns.cloudflare.com
@@ -154,6 +170,7 @@ jack.ns.cloudflare.com
 jade.ns.cloudflare.com
 jake.ns.cloudflare.com
 james.ns.cloudflare.com
+jamie.ns.cloudflare.com
 janet.ns.cloudflare.com
 jasmine.ns.cloudflare.com
 jason.ns.cloudflare.com
@@ -161,6 +178,7 @@ jay.ns.cloudflare.com
 jean.ns.cloudflare.com
 jeff.ns.cloudflare.com
 jeremy.ns.cloudflare.com
+jerome.ns.cloudflare.com
 jerry.ns.cloudflare.com
 jessica.ns.cloudflare.com
 jill.ns.cloudflare.com
@@ -180,8 +198,11 @@ kai.ns.cloudflare.com
 kami.ns.cloudflare.com
 kanye.ns.cloudflare.com
 kara.ns.cloudflare.com
+karina.ns.cloudflare.com
+karl.ns.cloudflare.com
 kate.ns.cloudflare.com
 kay.ns.cloudflare.com
+ken.ns.cloudflare.com
 kevin.ns.cloudflare.com
 kia.ns.cloudflare.com
 kiki.ns.cloudflare.com
@@ -192,19 +213,23 @@ kristin.ns.cloudflare.com
 kurt.ns.cloudflare.com
 lady.ns.cloudflare.com
 lakas.ns.cloudflare.com
+lana.ns.cloudflare.com
 lara.ns.cloudflare.com
+lars.ns.cloudflare.com
 laura.ns.cloudflare.com
 leah.ns.cloudflare.com
 lee.ns.cloudflare.com
 leia.ns.cloudflare.com
 lex.ns.cloudflare.com
 lia.ns.cloudflare.com
+lila.ns.cloudflare.com
 lily.ns.cloudflare.com
 lina.ns.cloudflare.com
 linda.ns.cloudflare.com
 lisa.ns.cloudflare.com
 liv.ns.cloudflare.com
 logan.ns.cloudflare.com
+lorna.ns.cloudflare.com
 lou.ns.cloudflare.com
 lucy.ns.cloudflare.com
 luke.ns.cloudflare.com
@@ -216,6 +241,7 @@ maria.ns.cloudflare.com
 mario.ns.cloudflare.com
 marjory.ns.cloudflare.com
 mark.ns.cloudflare.com
+marty.ns.cloudflare.com
 mary.ns.cloudflare.com
 matt.ns.cloudflare.com
 max.ns.cloudflare.com
@@ -227,11 +253,14 @@ megan.ns.cloudflare.com
 melinda.ns.cloudflare.com
 melissa.ns.cloudflare.com
 merlin.ns.cloudflare.com
+micah.ns.cloudflare.com
+michelle.ns.cloudflare.com
 miki.ns.cloudflare.com
 miles.ns.cloudflare.com
 mimi.ns.cloudflare.com
 mira.ns.cloudflare.com
 mitch.ns.cloudflare.com
+mona.ns.cloudflare.com
 nadia.ns.cloudflare.com
 ned.ns.cloudflare.com
 neil.ns.cloudflare.com
@@ -240,12 +269,16 @@ newt.ns.cloudflare.com
 nia.ns.cloudflare.com
 nick.ns.cloudflare.com
 nicole.ns.cloudflare.com
+nile.ns.cloudflare.com
 nina.ns.cloudflare.com
 nitin.ns.cloudflare.com
 noah.ns.cloudflare.com
+nola.ns.cloudflare.com
+nora.ns.cloudflare.com
 norm.ns.cloudflare.com
 norman.ns.cloudflare.com
 olga.ns.cloudflare.com
+owen.ns.cloudflare.com
 pablo.ns.cloudflare.com
 pam.ns.cloudflare.com
 pat.ns.cloudflare.com
@@ -264,6 +297,7 @@ reza.ns.cloudflare.com
 rick.ns.cloudflare.com
 rihana.ns.cloudflare.com
 rita.ns.cloudflare.com
+roan.ns.cloudflare.com
 rob.ns.cloudflare.com
 robin.ns.cloudflare.com
 rocky.ns.cloudflare.com
@@ -271,6 +305,7 @@ rosa.ns.cloudflare.com
 rose.ns.cloudflare.com
 roxy.ns.cloudflare.com
 rudy.ns.cloudflare.com
+ruth.ns.cloudflare.com
 sam.ns.cloudflare.com
 sandy.ns.cloudflare.com
 sara.ns.cloudflare.com
@@ -306,18 +341,22 @@ tricia.ns.cloudflare.com
 ulla.ns.cloudflare.com
 uma.ns.cloudflare.com
 vera.ns.cloudflare.com
+vern.ns.cloudflare.com
 vick.ns.cloudflare.com
 vida.ns.cloudflare.com
 vin.ns.cloudflare.com
 violet.ns.cloudflare.com
+vita.ns.cloudflare.com
 wally.ns.cloudflare.com
 walt.ns.cloudflare.com
 wanda.ns.cloudflare.com
+wesley.ns.cloudflare.com
 west.ns.cloudflare.com
 will.ns.cloudflare.com
 woz.ns.cloudflare.com
 yolanda.ns.cloudflare.com
 zara.ns.cloudflare.com
+zelda.ns.cloudflare.com
 zita.ns.cloudflare.com
 zod.ns.cloudflare.com
 zoe.ns.cloudflare.com

cloudflare_owned_domains.txt

@@ -1,4 +1,5 @@
 brokendnssec.net
+betterinternet.com
 cloudflare-dns.com
 cloudflare-free.com
 cloudflare-ipfs.com

what-to-do.md

@@ -180,15 +180,12 @@ if ($iscf) {rewrite ^ https://example.com/cfwsorry.php;}
 ...
 }
 
-
-[ code cfwsorry.php ]
-
 <?php
 header('HTTP/1.1 406 Not Acceptable');
 echo <<<CLOUDFLARED
-Thank you for visiting ourwebsite.com!
+Thank you for visiting ourwebsite.com!<br />
-We are sorry, but we can't serve you because your connection is being intercepted by Cloudflare.
+We are sorry, but we can't serve you because your connection is being intercepted by Cloudflare.<br />
-Please read https://notabug.org/themusicgod1/cloudflare-tor/ for more information.
+Please read https://notabug.org/themusicgod1/cloudflare-tor/ for more information.<br />
 CLOUDFLARED;
 die();
 ```
@@ -219,7 +216,7 @@ die();
 
 Let's talk about _other software's privacy_...
 
-- If you really need to use Firefox, pick "[Firefox ESR](https://www.mozilla.org/en-US/firefox/organizations/)". ESR is developed for company and organizations, thus _some_ spyware code is disabled by default. Portable version is [here](https://portableapps.com/apps/internet/firefox-portable-esr).
+- If you really need to use Firefox, pick "[Firefox ESR](https://www.mozilla.org/en-US/firefox/organizations/)". ESR is developed for company and organizations, thus _some_ spyware code is disabled by default. Portable version is [here](https://portableapps.com/apps/internet/firefox-portable-esr). But we tell you, Firefox is [horrible for privacy](https://www.reddit.com/r/privacytoolsIO/comments/81om92/what_are_the_differences_between_privacytoolsio/dv4orve/) in [many ways](https://spyware.neocities.org/articles/firefox.html).
 
 - Remember, Mozilla is [using Cloudflare service](https://www.robtex.com/dns-lookup/www.mozilla.org). They're also using [Cloudflare's DNS service on their product](https://www.theregister.co.uk/2018/03/21/mozilla_testing_dns_encryption/) D'oh!