commit 3ac4b46b94c283b2f268716e466f2835386f419a
Author: emma peel <[email protected]>
Date:   Sat Oct 9 12:40:07 2021 +0200

    content updates
---
 .../community-resources/good-bad-isps/contents.lr  | 29 ++++++++++++++--------
 .../tor-exit-guidelines/contents.lr                |  2 +-
 content/relay/getting-help/contents.lr             |  4 ++-
 content/relay/setup/post-install/contents.lr       |  4 +--
 .../relay/setup/snowflake/standalone/contents.lr   |  3 ++-
 databags/community-training-materials.json         |  6 ++---
 databags/onions.ini                                |  2 +-
 databags/relay-associations.ini                    |  2 +-
 8 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/content/relay/community-resources/good-bad-isps/contents.lr 
b/content/relay/community-resources/good-bad-isps/contents.lr
index 2af496c..455bc47 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -59,7 +59,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
 | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | 
**Comments** | **Last Updated** |
 
|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
-| [T-Systems`](http://www.t-systems.cz/) | - | Yes | Yes | ? | - | - |
+| [T-Systems](http://www.t-systems.cz/) | - | Yes | Yes | ? | - | - |
 
 
 ### France
@@ -68,9 +68,9 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
 | [Online.net](http://www.online.net/) | AS12876 | Yes | Yes | Yes | The 
account holder is responsible for all the traffic going through theirs 
servers.| 01/28/2019 |
 | [Gandi VPS](https://www.gandi.net/) | - | Yes | Yes | Yes| Gandi send some 
abuse complaints to Exit relays, but they do not stop the server, and when you 
tell them your server is a Tor Exit relay, they say it is OK. They ask Exit 
relays to use the standard Reduced Exit Policy | - |
-| [OVH Kimsufi](http://www.kimsufi.com/) | - | Yes | Yes | No | Changed their 
TOS in July 2013 and allow Tor as long as they don't notice illegal activities. 
Exit nodes would eventually be shut down, but relays are allowed. Octave Klaba, 
CEO of OVH said himself that the TOS have been changed to make them clearer 
about the use of Tor. Many relays are currently running on Kimsufi servers | - |
+| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | 
Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. 
Running a Tor exit node is strictly forbidden and can lead to the suspension 
and even termination of your server and account." | 09/27/2021 |
 | [Digicube](http://www.digicube.fr/) | - | Yes | Yes | Yes | - | - |
-| [Pulse Servers](http://www.pulseservers.com/) | - | Yes | Yes | Yes | VPS 
uses OVH AS. You can build ANY kind tor relays. | 05/01/2016 |
+| [Pulse Servers](http://www.pulseservers.com/) | AS16276 | Yes | Yes | Yes | 
VPS uses OVH AS. You can build ANY kind tor relays. | 09/27/2021 |
 
 
 
@@ -96,14 +96,14 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - 
| 2018-10-25 |
 | [linevast](https://www.linevast.de) | AS201206 | No | No | No |  | 03/2021 |
 | [Server4You](https://www.server4you.de)| AS131914 | No | No | No | - | 
03/2021 |
-| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good 
dedicated root servers for a good price. "It is not a Problem, however, abuse 
reports can lead to a server lock" | 03/2021 |
-| [Contabo](https://contabo.de) | AS51167  | No | No | No | Tor prohibited due 
to terms of service | 03/2021 |
+| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good 
dedicated root servers for a good price. Unmetered bandwidth on dedicated 
servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to 
a server lock" | 09/27/2021 |
+| [Contabo](https://contabo.de) | AS51167 | No | No | No | Tor prohibited due 
to terms of service | 03/2021 |
 | [Strato](https://strato.de) | AS6724 | No | No | No | - | 03/2021 |
 | [PraHost](https://www.prahost.com) | - | Yes | Yes | Yes | "If there is any 
abuse notice received, you need to solve it in given time, else your IP will be 
blocked until you take any action" | 03/2021 |
 | [DomainFactory](https://www.df.eu/de/cloud-hosting/cloud-server) | AS34011 | 
Yes | Yes | Yes | Only allowed on jiffybox | 03/2021 |
 | [NetCologne](https://www.netcologne.de) | - | - | Yes | Yes | - | - |
 | [Signaltransmitter](https://signaltransmitter.de) | AS24961 | Yes | Yes | 
Yes | "In principle, we do not limit our services apart from mining bitcoins" | 
03/2021 |
-| [Netcup](https://www.netcup.de) | AS197540 | Yes | Yes | Yes | Tor allowed 
on VPS and rootservers | 03/2021 |
+| [Netcup](https://www.netcup.de) | AS197540 | Yes | Yes | Yes | 40-120TB 
bandwidth - Tor exit nodes allowed on VPS and rootservers - "Yes, it is. 
Everything is allowed that the T&Cs do not exclude." | 09/27/2021 |
 | [Onyxhosting](https://onyxhosting.de) | - | No | No | No | - | 03/2021 |
 | [IP-Projects](https://www.ip-projects.de) | AS48314 | No | No | No | - | 
03/2021 |
 | [Lansol](https://www.lansol.de) | - | No | No | No | - | 03/2021 |
@@ -163,6 +163,11 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
 | [Baltic Servers](http://www.balticservers.com) | - |  Yes | Yes | Yes | All 
abuse mails they got yielded support tickets | - |
 
+### Luxembourg
+
+| **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | 
**Comments** | **Last Updated** |
+|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
+| [BuyVM.net](https://buyvm.net) | AS53667 | Yes | Yes | Yes | New Tor rules 
[here](https://buyvm.net/acceptable-use-policy/#3). All relays are fine if you 
follow the steps. Notices are ignored. Unmetered bandwidth. | 09/27/2021 |
 
 ### Mexico
 
@@ -196,7 +201,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [Worldstream](https://www.worldstream.nl) | AS49981 | Yes | Yes | No |  - | 
02/06/2019 |
 | [LeaseWeb](https://www.leaseweb.com/) | - | Yes | Yes | Yes | - | - |
 | [Novogara](http://www.novogara.com) | - | Yes | Yes | Yes | Explicitly 
allows Tor exit nodes and forwards abuse/DCMA, but their network isn't the most 
stable. You need to email them for a custom offer. They also accept 
Bitcoin/UKash/CashU | - |
-| [Netrouting`](http://netrouting.nl/) | - | Yes | Yes | No | ISP has 
confirmed by e-mail that exit nodes are NOT acceptable. | 2014-10-15 |
+| [Netrouting](http://netrouting.nl/) | - | Yes | Yes | No | ISP has confirmed 
by e-mail that exit nodes are NOT acceptable. | 2014-10-15 |
 | [DirectVPS](http://directvps.nl/) | - | Yes | Yes | ? | - | - |
 | [Versio](http://versio.nl/) | - | Yes | Yes | No | - | 2013 |
 | [SnelServer](https://www.snelserver.com/) | - | Yes | Yes | Yes | Abuse 
complaints must be responded to within 24 hours or the system automatically 
suspends your account until you do. | 2014 |
@@ -281,18 +286,19 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [Clustered.net](http://www.clustered.net) | - | Yes | Yes | Yes | - | - |
 | [Bitfolk](http://bitfolk.com/) | - | Yes | Yes | Yes | They are very 
knowledgable and understand Tor and its uses. They are hot on spam and abuse so 
advise changing the default exit (good idea in the UK anyhow). Any DMCA notices 
received were simply forwarded on without agro | - |
 | [RapidSwitch](http://rapidswitch.com/) | - | Yes | Yes | ? | - | 07/2014 |
+| [Hostworld](https://hostworld.uk/) | - | Yes | Yes | Yes | They are very 
responsive and understand the uses of Tor. They have a strict policy with 
abuse/spam and will not refund under their money back guarantee if abuse has 
been noticed. | 09/2021 |
 
 ### US
 
 | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | 
**Comments** | **Last Updated** |
 
|-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
 | [2HOST](https://2host.com/) | - | Yes | Yes | Yes(?) | Vague AUP/Abuse 
handling | 10/15/14 |
-| [Amazon Web Services (AWS)](https://aws.amazon.com) | - | Yes | Yes | No | - 
| - |
+| [Amazon Web Services (AWS)](https://aws.amazon.com) | - | Yes | Yes | No | 
Expensive bandwidth, you WILL be charged extra after reaching 15GB. | 
09/27/2021 |
 | [AmeriNOC](https://www.amerinoc.com/) | - | Yes | Yes | Yes | - | - |
 | [Arvixe](https://www.arvixe.com/vps_virtual_private_servers_hosting/) | - | 
Yes | Yes | Yes | - | 06/19/13 |
 | [Axigy](http://www.axigy.com) | - | Yes | Yes | Yes | - |  - |
 | [Blacklotus](http://www.blacklotus.net) | - | Yes | Yes | Yes | Liberal 
abuse handling policies | - |
-| [BuyVM.net](https://buyvm.net) | AS53667 | Yes | Yes | Yes | New Tor rules 
[here](https://buyvm.net/acceptable-use-policy/#3). All relays are fine if you 
follow the steps. | - |
+| [BuyVM.net](https://buyvm.net) | AS53667 | Yes | Yes | Yes | New Tor rules 
[here](https://buyvm.net/acceptable-use-policy/#3). All relays are fine if you 
follow the steps. Notices are ignored. Unmetered bandwidth. | 09/27/2021 |
 | [Catalyst Host](https://catalysthost.com/) | - | ? | No | No | "If you are 
interested in hosting either, you can ask us about a dedicated server." | 
10/01/14 |
 | [Cloudvider](https://www.clouvider.co.uk/) | - | No | No | No | This is for 
their US Operations arm. They will cancel your account and claim it is a ToS 
violation, which requires you to pay out a 60-day notice. | 10/2020 |
 | [ChunkHost](http://chunkhost.com) | - | Yes | Yes | ? | Questionable DMCA 
handling | 01/01/12 |
@@ -307,8 +313,9 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [HostHatch](https://hosthatch.com) | AS46562 | Yes | Yes | No | Their vps 
isp are mixed include: QuadraNet, nLayer, AboveNet, Inteliquent, Atrato 
Networks and open peering with the entire Any2LA and Atlanta TIE networks. | 
05/01/16 |
 | [HostUS](http://hostus.us/) | AS25926 | Yes | Yes | No | - | 10/16/14 |
 | [IPXcore](https://ipxcore.com/) | - | Yes | Yes | No | - | - |
+| [Linode](https://www.linode.com/) | AS63949 | Yes | Yes | Yes | "We allow 
Tor exits as long as they have a reduced exit policy." - I've used 10TB this 
month in total for all 3 of my exit nodes spread out in different locations. 
I've recieved 0 notices from Linode while using the free 100$ credits you get. 
I allow ports 53,80,443. My DE exit node is now the [2nd 
fastest](https://i.imgur.com/Owj6HkD.png) Linode relay, with UK third. I would 
recommend this host to use the free credits, but wouldn't really recommend 
paying as bandwidth is limited. | 10/07/2021 |
 | [Luna Node](https://www.lunanode.com/index.php) | - | Yes | Yes | No | - | 
05/01/14 |
-| [OVH](https://www.ovh.com/us/index.xml ) | AS16276 | Yes | Yes | ? | - | 
12/31/14 |
+| [OVH](https://www.ovh.com/us/index.xml) | AS16276 | Yes | Yes | No | 
Unmetered bandwidth in non asia locations. - "I will gladly explain this 
situation for you. Running a Tor exit node is strictly forbidden and can lead 
to the suspension and even termination of your server and account." | 
09/27/2021 |
 | [Oplink.net](https://www.oplink.net) | - | Yes | Yes | No | - | 09/03/15 |
 | [Psychz.net](https://www.psychz.net/) | - | Yes | Yes | Yes | Very Exit 
friendly. Standard Tor response will resolve abuse issues. | 10/07/15 |
 | [PulseServers](https://www.pulseservers.com) | AS16276 | Yes | Yes | Yes | 
Exit-friendly. | 05/01/16 |
@@ -331,6 +338,8 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [Xmission](https://www.xmission.com/) | - | Yes | Yes | Yes | - | 01/28/15 |
 | [blackpulsehosting](https://www.blackpulsehosting.com) | - | Yes | Yes | No 
| - | 10/25/15 |
 | [MonkeyBrains](https://monkeybrains.net) | AS32329 | Yes | Yes | Yes | Only 
offers colocation, no cheap VPS option. | 1/14/19 |
+| [Universal Hosting](https://universal-hosting.com) | - | No | No | No | 
Charges, and suspends customers. [More 
info](https://universal-hosting.com/abuse) | 9/14/2021 |
+
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/community-resources/tor-exit-guidelines/contents.lr 
b/content/relay/community-resources/tor-exit-guidelines/contents.lr
index 722e513..2f56184 100644
--- a/content/relay/community-resources/tor-exit-guidelines/contents.lr
+++ b/content/relay/community-resources/tor-exit-guidelines/contents.lr
@@ -123,7 +123,7 @@ If you have your own experience of abuse handling, just 
share it on our public m
 
 Please read all the technical details before getting started. If you have any 
questions or need help, please contact us at 
[tor-relays](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays).
 
-* [Tor Relay Guide](https://community.torproject.org/relay)
+* [Tor Relay Guide](/relay)
 
 * Set up an informative website on the exit IP(s) on port 80.
 
diff --git a/content/relay/getting-help/contents.lr 
b/content/relay/getting-help/contents.lr
index 1ef463b..b625e78 100644
--- a/content/relay/getting-help/contents.lr
+++ b/content/relay/getting-help/contents.lr
@@ -6,7 +6,9 @@ title: Getting help
 ---
 body:
 
-If you run into problems while setting up your relay, you can ask your 
questions on the public [tor-relays mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays).  The 
list is a great resource for asking (and answering) questions, and for getting 
to know other relay operators. Make sure to check out the archives!
+If you run into problems while setting up your relay, please refer to the 
[FAQs page](https://support.torproject.org/relay-operators) in the Support 
Portal.
+You can ask your questions on the public [tor-relays mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays).
+The list is a great resource for asking (and answering) questions, and for 
getting to know other relay operators. Make sure to check out the archives!
 
 You can also get help by joining the IRC channel #tor-relays in the network 
[irc.oftc.net](https://support.torproject.org/get-in-touch/#irc-help).
 
diff --git a/content/relay/setup/post-install/contents.lr 
b/content/relay/setup/post-install/contents.lr
index dbd00c6..ccd8e8d 100644
--- a/content/relay/setup/post-install/contents.lr
+++ b/content/relay/setup/post-install/contents.lr
@@ -67,7 +67,7 @@ The following torrc configuration options can be used to 
restrict bandwidth and
 
 Having a fast relay for some time of the month is preferred over a slow relay 
for the entire month.
 
-Also see the bandwidth entry in the 
[FAQ](https://support.torproject.org/operators/bandwidth-shaping/).
+Also see the bandwidth entry in the 
[FAQ](https://support.torproject.org/relay-operators/bandwidth-shaping/).
 
 # 7. Check IPv6 availability
 
@@ -97,7 +97,7 @@ Note: You have to explicitly specify your IPv6 address in 
square brackets, you c
 If you have a global IPv6 address you should be able to find it in the output 
of the following command:
 
 ```
-ip addr|grep inet6|grep global
+ip -6 addr | grep global | sed 's/inet6//;s#/.*##'
 ```
 
 If you are an exit relay with IPv6 connectivity, tell your tor daemon to allow 
exiting via IPv6 so clients can reach IPv6 destinations:
diff --git a/content/relay/setup/snowflake/standalone/contents.lr 
b/content/relay/setup/snowflake/standalone/contents.lr
index 43cdcb9..74b0532 100644
--- a/content/relay/setup/snowflake/standalone/contents.lr
+++ b/content/relay/setup/snowflake/standalone/contents.lr
@@ -19,7 +19,7 @@ There are several ways to setup and run a standalone 
snowflake proxy.
 
 You must first have [Docker](https://docs.docker.com/engine/install/) and 
[docker-compose](https://docs.docker.com/compose/install/) installed.
 
-We have a [Docker 
image](https://hub.docker.com/repository/docker/thetorproject/snowflake-proxy) 
to ease the setup of a snowflake proxy.
+We have a [Docker 
image](https://hub.docker.com/r/thetorproject/snowflake-proxy) to ease the 
setup of a snowflake proxy.
 First [download 
docker-compose.yml](https://gitlab.torproject.org/tpo/anti-censorship/docker-snowflake-proxy/raw/main/docker-compose.yml).
 Then, deploy the proxy by running:
 ```
@@ -49,6 +49,7 @@ You will need Go 1.13+ to run the Snowflake proxy.
    ```
 3. Build the Snowflake proxy.
    ```
+   cd snowflake/proxy
    go build
    ```
 4. Run the Snowflake proxy.
diff --git a/databags/community-training-materials.json 
b/databags/community-training-materials.json
index 1c7eb48..bec44ea 100644
--- a/databags/community-training-materials.json
+++ b/databags/community-training-materials.json
@@ -2,7 +2,7 @@
   "all-about-tor": {
     "name": "All About Tor",
     "author": "Tor Project",
-    "link": 
"https://community.torproject.org/training/resources/tor-relay-workshop/";,
+    "link": 
"https://gitweb.torproject.org/community/training.git/plain/2021/all-about-tor/all-about-tor-full-pack.odp";,
     "description": "Full set of slides for Tor Trainings: how the Tor network 
works, censorship circumvention, Tor Browser installation, and OnionShare.",
     "date": "2021",
     "cover": "/static/images/training/all-about-tor.png",
@@ -16,7 +16,7 @@
     "date": "2019",
     "cover": "/static/images/training/todo-sobre-tor.png",
     "languages": "Spanish",
-    "link" : 
"https://community.torproject.org/training/resources/tor-relay-workshop/";
+    "link" : 
"https://gitweb.torproject.org/community/training.git/plain/2019/all-about-tor/all-about-tor-full-pack+es.odp";
   },
   "tor network workshop": {
     "author": "Tor Project",
@@ -37,7 +37,7 @@
     "date": "2021",
     "cover": "/static/images/training/running-tor-bridges.png",
     "languages": "English",
-    "link": 
"https://community.torproject.org/training/resources/tor-relay-workshop/";
+    "link": 
"https://gitweb.torproject.org/community/training.git/plain/2021/private-bridges/private-bridges-workshop.odp";
   },
   "exploring-the-tor-network": {
     "name": "Exploring the Tor network (poster)",
diff --git a/databags/onions.ini b/databags/onions.ini
index 096c225..5f1470b 100644
--- a/databags/onions.ini
+++ b/databags/onions.ini
@@ -14,7 +14,7 @@ image = /static/images/onions/png/dw.png
 label = Deutsche Welle
 
 [bbc]
-link = https://www.bbcnewsv2vjtpsuy.onion 
+link = 
https://www.bbcnewsd73hkzno2ini43t4gblxvycyac5aw4gnv7t2rccijh7745uqd.onion/ 
 image = /static/images/onions/png/bbc.png
 label = BBC
 
diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini
index 20913d1..e9923ad 100644
--- a/databags/relay-associations.ini
+++ b/databags/relay-associations.ini
@@ -139,7 +139,7 @@ display =
 donate =  
 
 [accessnow]
-link = https://accessnow.net
+link = https://accessnow.org
 image = 
 label = Access Now
 country = US



_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to