Merge branch 'httperror' of libBletchley/cloudflare-tor into master

5 files changed, 99 insertions, 97 deletions

diff --git a/instructions.md b/instructions.md
index 2290e50a..9a01abdf 100644
--- a/instructions.md
+++ b/instructions.md
@@ -89,14 +89,17 @@ Type B: Use "[Is MITM?](https://searxes.eu.org/collab/sxes/tool_ismitm.php)" web
 
 | List name | Description |
 | -------- | -------- |
-| list_error403.txt     | Returns HTTP Error 403 (Forbidden)     |
-| list_error462.txt     | Returns HTTP Error 462     |
-| list_customerror.txt     | Returns custom error message (not HTTP 403)     |
-| list_other.txt     | any other form of tor-hostility or mistreatment |
-| list_siteground.txt | siteground.com is a Tor-hostile hosting service that indiscriminately DoSes all Tor users with the collective judgement: "our system thinks you might be a robot!" Sometimes the site functions, and sometimes it times out, but the robot accusation is very common. |
+| list_http_error.txt           | Websites that instantly and unconditionally deny service to Tor visitors by returning an HTTP error.  HTTP 403 is the most common but this list catalogs all HTTP responses that entail DoS (i.e. not HTTP 200).  File format is: <FQDN> <http error code> |
+| list_customerror.txt          | Custom error message renders for Tor visitors generally without HTTP error. |
+| list_other.txt                | Any other form of tor-hostility or mistreatment.  This includes sites somewhat functional for Tor users to some extent but sneaky and unexpected adverse retalitory actions are taken against Tor visitors. |
+| list_siteground.txt           | siteground.com is a Tor-hostile hosting service that indiscriminately DoSes all Tor users with the collective judgement: "our system thinks you might be a robot!" Sometimes the site functions, and sometimes it times out, but the robot accusation (illustrated below) is very common. |
 | list_formerly_tor-hostile.txt | was previously on one of the above tor-hostile lists |
+| (obsolete) list_error403.txt  | Superceded by list_http_error.txt.  Returns HTTP Error 403 (Forbidden) |
+| (obsolete) list_error462.txt  | Superceded by list_http_error.txt.  Returns HTTP Error 462 |
 
-![](image/siteground.jpg)
+This is how Siteground-hosted sites often appear to Tor visitors when timeouts/tarpitting doesn't occur:
+
+![](image/siteground.jpg) &lt;= If you see this please update `list_siteground.txt`.
 
 ```
 IMPORTANT: Please add only "FQDN" or "FQDN[space](comment here)"
@@ -112,10 +115,9 @@ Some websites use other companies with the CloudFlare business model.
 
 This is a collection of websites that ban Tor exits, other than through Cloudflare(e.g. showing access denied pages, systematic timing out connections, ...).
 
-[Add-on "whyrejectme"](README.md) will help your list_error403 collection.
-
+[Add-on "whyrejectme"](README.md#what-can-you-do) will help your `list_http_error.txt` collection.
 ---
 
 Information:
 
-- [How to setup git](instructions_git.md)
\ No newline at end of file
+- [How to setup git](instructions_git.md)
diff --git a/not_cloudflare/list_customerror.txt b/not_cloudflare/list_customerror.txt
index ecfb1b69..be0e18d2 100644
--- a/not_cloudflare/list_customerror.txt
+++ b/not_cloudflare/list_customerror.txt
@@ -144,7 +144,6 @@ lovehoney.co.uk
 lowtechmagazine.com
 lufthansa.com
 mafgani.net
-manta.com
 meaningness.com
 midtnmusic.com
 mixcloud.com
diff --git a/not_cloudflare/list_error403.txt b/not_cloudflare/list_error403.txt
deleted file mode 100644
index e1814b75..00000000
--- a/not_cloudflare/list_error403.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-abebooks.com
-acehardware.com
-adidas.com
-ajc.com
-angieslist.com
-asus.com
-bitvps.com
-caot.ca
-capitalone.com
-captaintrain.com
-catbox.moe
-citizensbankonline.com
-cnbc.com
-curbed.com
-delishably.com
-dengarden.com
-dluat.com
-dohop.com
-downtownorlando.com
-eater.com
-europa.eu
-expedia.com
-expo2015.org
-forum.pfsense.org
-forums.freebsd.org
-freegeoip.net
-freelancer.is
-freshworks.com
-geocaching.com
-ghostbrowser.com
-groupon.com
-gutenberg.org
-hoovers.com
-hot-topic.co.nz
-hubpages.com
-hunker.com
-ibanking-services.com
-intra.ruc.dk
-irs.gov
-justia.com
-knowyourmeme.com
-kroger.com
-lastword.at
-libertymutual.com
-logon.e-boks.dk
-missingmoney.com
-moodle.ruc.dk
-navyfederal.org
-no2nsa.x10.bz
-quantas.com
-racked.com
-rei.com
-republicbuzz.com
-retailmenot.com
-rijksoverheid.nl
-riteaid.com
-safeco.com
-sec.gov
-securifi.com
-signon.ruc.dk
-singpolyma.net
-slbprinting.com
-stadssb.ruc.dk
-staples.com
-stefanv.com
-study.com
-techwalla.com
-theverge.com
-usnews.com
-usps.com
-tomsguide.com
-tomshardware.com
-twistedthrottle.com
-vueling.com
-wayfair.com
-whodoyou.com
-wigle.net
-wikidevi.com
-witopia.net
-www.cisco.com
-www.flytap.com
-www.spirit.com
-yopmail.com
-yopmail.net
diff --git a/not_cloudflare/list_error462.txt b/not_cloudflare/list_error462.txt
deleted file mode 100644
index 185a045e..00000000
--- a/not_cloudflare/list_error462.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-lifewire.com
-thebalance.com
-tripsavvy.com
diff --git a/not_cloudflare/list_http_error.txt b/not_cloudflare/list_http_error.txt
new file mode 100644
index 00000000..f823b096
--- /dev/null
+++ b/not_cloudflare/list_http_error.txt
@@ -0,0 +1,88 @@
+abebooks.com 403
+acehardware.com 403
+adidas.com 403
+ajc.com 403
+angieslist.com 403
+asus.com 403
+bitvps.com 403
+caot.ca 403
+capitalone.com 403
+captaintrain.com 403
+catbox.moe 403
+citizensbankonline.com 403
+cnbc.com 403
+curbed.com 403
+delishably.com 403
+dengarden.com 403
+dluat.com 403
+dohop.com 403
+downtownorlando.com 403
+eater.com 403
+europa.eu 403
+expedia.com 403
+expo2015.org 403
+forum.pfsense.org 403
+forums.freebsd.org 403
+freegeoip.net 403
+freelancer.is 403
+freshworks.com 403
+geocaching.com 403
+ghostbrowser.com 403
+groupon.com 403
+gutenberg.org 403
+hoovers.com 403
+hot-topic.co.nz 403
+hubpages.com 403
+hunker.com 403
+ibanking-services.com 403
+intra.ruc.dk 403
+irs.gov 403
+justia.com 403
+knowyourmeme.com 403
+kroger.com 403
+lastword.at 403
+libertymutual.com 403
+lifewire.com 462
+logon.e-boks.dk 403
+manta.com 403
+missingmoney.com 403
+moodle.ruc.dk 403
+navyfederal.org 403
+no2nsa.x10.bz 403
+quantas.com 403
+racked.com 403
+rei.com 403
+republicbuzz.com 403
+retailmenot.com 403
+rijksoverheid.nl 403
+riteaid.com 403
+safeco.com 403
+sec.gov 403
+securifi.com 403
+signon.ruc.dk 403
+singpolyma.net 403
+slbprinting.com 403
+stadssb.ruc.dk 403
+staples.com 403
+stefanv.com 403
+study.com 403
+techwalla.com 403
+thebalance.com 462
+theverge.com 403
+tomsguide.com 403
+tomshardware.com 403
+tripsavvy.com 462
+twistedthrottle.com 403
+usnews.com 403
+usps.com 403
+vueling.com 403
+wayfair.com 403
+whodoyou.com 403
+wigle.net 403
+wikidevi.com 403
+witopia.net 403
+www.cisco.com 403
+www.flytap.com 403
+www.spirit.com 403
+yopmail.com 403
+yopmail.net 403