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

.gitignore

@@ -1,2 +0,0 @@
-__pycache__
-*.pyc

FAQ.md

@@ -1,22 +0,0 @@
-Q) This is a text directory!  There's no code here
-
-A) Correct.  If this is a problem, contact us via creating an issue and we will make sure this isn't the case anymore.
-
-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[2] and that's that.
-
-A) There is always hope in resistance.  Resistance is fertile[1].  Even some of the darker outcomes 
-( unfriendly AI takeover, coopting of the www, NSA MiTMing everything) comes to be, the very act of resistance trains us
-to continue to destabilize the dystopic status quo that results.  Resist!
-
-Q) I have an idea of a project of how to use this data!
-
-A) Fantastic!  But using the data on these lists is outside of the scope of
-this repository.  Tell us what you use this data for, and we will link to your
-project!
-
-Sources
-
-[1] http://infoshop.org/AnarchistFAQSectionJ1
-
-[2] https://www.usenix.org/system/files/conference/woot16/woot16-paper-wustrow.pdf 

README.md

@@ -7,16 +7,15 @@ Cloudflare similarly prevents those in southeast asia and elsewhere who have poo
 This repository is a list of websites that are behind The Great Cloudwall, and also actively blocking Tor users.
 
 * [Domains using Cloudflare](splits/)
-* [Hostile to Tor users](cloudflare-tor-hostile-list.txt)
 * [Non-Cloudflare but filtering/blocking tor users](https://notabug.org/themusicgod1/non-cloudflare-tor-hostile)
 
 There are more details of why what they are doing is wrong available [here](cloudflare-philosophy.md).
-Also see [Frequently Asked Questions](FAQ.md).
+Also see [Frequently Asked Questions](faq.md).
 
 # What can you do?
 
-* Update the list: [List instructions](instructions.md)
 * See [our list of recommended actions](what-to-do.md)
+* Update the list: [List instructions](instructions.md)
 
 There are other lists, but this one is one where every entry on the list a human being has actually tried
 to go to, and has been blocked.

cloudflare_owned_domains.txt

@@ -4,3 +4,4 @@ cloudflare-dns.com
 cloudflare-ipfs.com
 cloudflare-quic.com
 cloudflarestatus.com
+cloudflareapps.com

faq.md

@@ -0,0 +1,13 @@
+Q) This is a text directory! There's no code here
+
+A) No. Take a look at /bcma/ and /tool/ folder.
+
+
+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.
+
+A) There is always hope in resistance. [Resistance is fertile](http://infoshop.org/AnarchistFAQSectionJ1). Even some of the darker outcomes ( unfriendly AI takeover, coopting of the www, NSA MiTMing everything) comes to be, the very act of resistance trains us to continue to destabilize the dystopic status quo that results. Resist!
+
+
+Q) I have an idea of a project of how to use this data!
+
+A) Fantastic! But using the data on these lists is outside of the scope of this repository. Tell us what you use this data for, and we will link to your project!

globalist.md

@@ -1,26 +0,0 @@
-'Globalist' project used to be distributed with this project, and is still recommended as an interesting idea.
-However since we're mostly on notabug anyway we might as well keep the two projects seperate
-
-For 'Globalist' see globalist subdirectory [here](http://notabug.org/themusicgod1/globalist).
- 
--> dead simple use of git and .onions to create a distributed repo for collaborative editin
-no more hosting needed, just an ever-changing network of .onions. putting the "D" back in "DVCS" ...
- 
-  Anyone feeling adventurous? try downloading the script, have a good look at it of course and then try
-  peering with hw5deh5c4im6obke.onion (post your own .onion, which Globalist generates, here)
-  r2skudzatpggydyu.onion
-  and give me a yell if it doesn't work (here or @fnord@quitter.se or @fnordomat@github.com)
-  I shall set up a cronjob to pull your changes every 1/2 hour maybe and we'll see how it goes
- 
--> anyone can git pull git://hw5deh5c4im6obke.onion/repo.git, and I'll pull back your changes. my little script just helps set this up
--> of course the repo can additionally be hosted somewhere "official" but why depend on it?
- 
-after that, let's improve the script and once it's out of alpha phase, decentralize!
- 
-Remarks:
-
-- git blame can presumably be used to colorize contributions later
-- no need to run it all the time, unsuccessful pull is not a problem (conditionally allow push in later version?)
- 
-got a better idea?
-