[tor-commits] [community/translations] update contents
emmapeel at torproject.org
emmapeel at torproject.org
Tue May 18 12:28:22 UTC 2021
commit acec6f6168eed3c1d698d73d605df6c0d89eba7d
Author: emma peel <emma.peel at riseup.net>
Date: Tue May 18 14:23:32 2021 +0200
update contents
---
.../community-resources/bad-relays/contents.lr | 0
.../community-resources/contents.lr | 0
.../eff-tor-legal-faq/contents.lr | 0
.../tor-dmca-response/contents.lr | 0
.../community-resources/good-bad-isps/contents.lr | 0
.../relay-associations/contents.lr | 0
.../community-resources/swag/contents.lr | 0
.../tor-abuse-templates/contents.lr | 0
.../tor-exit-guidelines/contents.lr | 0
.../tor-relay-universities/contents.lr | 0
content/{relay-operations => relay}/contents.lr | 0
.../getting-help/contents.lr | 0
.../relays-requirements/contents.lr | 0
.../setup}/bridge/centos-rhel-opensuse/contents.lr | 0
.../setup}/bridge/contents.lr | 0
.../setup}/bridge/debian-ubuntu/contents.lr | 0
.../setup}/bridge/docker/contents.lr | 0
.../setup}/bridge/dragonflybsd/contents.lr | 0
.../setup}/bridge/fedora/contents.lr | 0
.../setup}/bridge/freebsd/contents.lr | 0
.../setup}/bridge/netbsd/contents.lr | 0
.../setup}/bridge/openbsd/contents.lr | 0
.../setup}/bridge/post-install/contents.lr | 0
.../setup}/bridge/windows/contents.lr | 0
.../technical-setup => relay/setup}/contents.lr | 0
.../setup}/exit/contents.lr | 0
.../setup}/guard/centosrhel/contents.lr | 0
.../setup}/guard/centosrhel/updates/contents.lr | 0
.../setup}/guard/contents.lr | 0
.../setup}/guard/debianubuntu/contents.lr | 0
.../setup}/guard/debianubuntu/updates/contents.lr | 0
.../setup}/guard/dragonflybsd/contents.lr | 0
.../setup}/guard/fedora/contents.lr | 0
.../setup}/guard/fedora/updates/contents.lr | 0
.../setup}/guard/freebsd/contents.lr | 0
.../setup}/guard/freebsd/updates/contents.lr | 0
.../setup}/guard/netbsd/contents.lr | 0
.../setup}/guard/openbsd/contents.lr | 0
.../setup}/guard/windows/contents.lr | 0
.../setup}/post-install/contents.lr | 0
content/relay/setup/snowflake/browser/contents.lr | 35 ++
content/relay/setup/snowflake/contents.lr | 28 ++
.../relay/setup/snowflake/standalone/contents.lr | 66 +++
.../technical-considerations/contents.lr | 0
.../types-of-relays/contents.lr | 0
.../resources/tor-relay-workshop/contents.lr | 549 +++++++++++++++++++++
content/user-research/guidelines/contents.lr | 2 +-
47 files changed, 679 insertions(+), 1 deletion(-)
diff --git a/content/relay-operations/community-resources/bad-relays/contents.lr b/content/relay/community-resources/bad-relays/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/bad-relays/contents.lr
rename to content/relay/community-resources/bad-relays/contents.lr
diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay/community-resources/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/contents.lr
rename to content/relay/community-resources/contents.lr
diff --git a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr b/content/relay/community-resources/eff-tor-legal-faq/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr
rename to content/relay/community-resources/eff-tor-legal-faq/contents.lr
diff --git a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr b/content/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
rename to content/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr
diff --git a/content/relay-operations/community-resources/good-bad-isps/contents.lr b/content/relay/community-resources/good-bad-isps/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/good-bad-isps/contents.lr
rename to content/relay/community-resources/good-bad-isps/contents.lr
diff --git a/content/relay-operations/community-resources/relay-associations/contents.lr b/content/relay/community-resources/relay-associations/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/relay-associations/contents.lr
rename to content/relay/community-resources/relay-associations/contents.lr
diff --git a/content/relay-operations/community-resources/swag/contents.lr b/content/relay/community-resources/swag/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/swag/contents.lr
rename to content/relay/community-resources/swag/contents.lr
diff --git a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr b/content/relay/community-resources/tor-abuse-templates/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/tor-abuse-templates/contents.lr
rename to content/relay/community-resources/tor-abuse-templates/contents.lr
diff --git a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr b/content/relay/community-resources/tor-exit-guidelines/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/tor-exit-guidelines/contents.lr
rename to content/relay/community-resources/tor-exit-guidelines/contents.lr
diff --git a/content/relay-operations/community-resources/tor-relay-universities/contents.lr b/content/relay/community-resources/tor-relay-universities/contents.lr
similarity index 100%
rename from content/relay-operations/community-resources/tor-relay-universities/contents.lr
rename to content/relay/community-resources/tor-relay-universities/contents.lr
diff --git a/content/relay-operations/contents.lr b/content/relay/contents.lr
similarity index 100%
rename from content/relay-operations/contents.lr
rename to content/relay/contents.lr
diff --git a/content/relay-operations/getting-help/contents.lr b/content/relay/getting-help/contents.lr
similarity index 100%
rename from content/relay-operations/getting-help/contents.lr
rename to content/relay/getting-help/contents.lr
diff --git a/content/relay-operations/relays-requirements/contents.lr b/content/relay/relays-requirements/contents.lr
similarity index 100%
rename from content/relay-operations/relays-requirements/contents.lr
rename to content/relay/relays-requirements/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay/setup/bridge/centos-rhel-opensuse/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
rename to content/relay/setup/bridge/centos-rhel-opensuse/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/contents.lr b/content/relay/setup/bridge/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/contents.lr
rename to content/relay/setup/bridge/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay/setup/bridge/debian-ubuntu/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
rename to content/relay/setup/bridge/debian-ubuntu/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay/setup/bridge/docker/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/docker/contents.lr
rename to content/relay/setup/bridge/docker/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr b/content/relay/setup/bridge/dragonflybsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr
rename to content/relay/setup/bridge/dragonflybsd/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/fedora/contents.lr b/content/relay/setup/bridge/fedora/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/fedora/contents.lr
rename to content/relay/setup/bridge/fedora/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay/setup/bridge/freebsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/freebsd/contents.lr
rename to content/relay/setup/bridge/freebsd/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay/setup/bridge/netbsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/netbsd/contents.lr
rename to content/relay/setup/bridge/netbsd/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay/setup/bridge/openbsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/openbsd/contents.lr
rename to content/relay/setup/bridge/openbsd/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/post-install/contents.lr b/content/relay/setup/bridge/post-install/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/post-install/contents.lr
rename to content/relay/setup/bridge/post-install/contents.lr
diff --git a/content/relay-operations/technical-setup/bridge/windows/contents.lr b/content/relay/setup/bridge/windows/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/bridge/windows/contents.lr
rename to content/relay/setup/bridge/windows/contents.lr
diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay/setup/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/contents.lr
rename to content/relay/setup/contents.lr
diff --git a/content/relay-operations/technical-setup/exit/contents.lr b/content/relay/setup/exit/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/exit/contents.lr
rename to content/relay/setup/exit/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr b/content/relay/setup/guard/centosrhel/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/centosrhel/contents.lr
rename to content/relay/setup/guard/centosrhel/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr b/content/relay/setup/guard/centosrhel/updates/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr
rename to content/relay/setup/guard/centosrhel/updates/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/contents.lr b/content/relay/setup/guard/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/contents.lr
rename to content/relay/setup/guard/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay/setup/guard/debianubuntu/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/debianubuntu/contents.lr
rename to content/relay/setup/guard/debianubuntu/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr b/content/relay/setup/guard/debianubuntu/updates/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
rename to content/relay/setup/guard/debianubuntu/updates/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr b/content/relay/setup/guard/dragonflybsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/dragonflybsd/contents.lr
rename to content/relay/setup/guard/dragonflybsd/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay/setup/guard/fedora/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/fedora/contents.lr
rename to content/relay/setup/guard/fedora/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr b/content/relay/setup/guard/fedora/updates/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
rename to content/relay/setup/guard/fedora/updates/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr b/content/relay/setup/guard/freebsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/freebsd/contents.lr
rename to content/relay/setup/guard/freebsd/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay/setup/guard/freebsd/updates/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
rename to content/relay/setup/guard/freebsd/updates/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/netbsd/contents.lr b/content/relay/setup/guard/netbsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/netbsd/contents.lr
rename to content/relay/setup/guard/netbsd/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/openbsd/contents.lr b/content/relay/setup/guard/openbsd/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/openbsd/contents.lr
rename to content/relay/setup/guard/openbsd/contents.lr
diff --git a/content/relay-operations/technical-setup/guard/windows/contents.lr b/content/relay/setup/guard/windows/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/guard/windows/contents.lr
rename to content/relay/setup/guard/windows/contents.lr
diff --git a/content/relay-operations/technical-setup/post-install/contents.lr b/content/relay/setup/post-install/contents.lr
similarity index 100%
rename from content/relay-operations/technical-setup/post-install/contents.lr
rename to content/relay/setup/post-install/contents.lr
diff --git a/content/relay/setup/snowflake/browser/contents.lr b/content/relay/setup/snowflake/browser/contents.lr
new file mode 100644
index 0000000..dc7e954
--- /dev/null
+++ b/content/relay/setup/snowflake/browser/contents.lr
@@ -0,0 +1,35 @@
+_model: page
+---
+color: primary
+---
+title: Browser Snowflake proxy
+---
+body:
+
+Running a Snowflake proxy as a browser add on is a great low-effort way to donate bandwidth if you don't have acces to an always-on highly connected server.
+There are very few requirements to running a browser-based proxy:
+1. Use Firefox or Chromium/Chrome as your browser
+2. Have WebRTC enabled
+
+### 1. Install the Snowflake addon to your browser
+
+If you are running Firefox, you can install our [Firefox addon](https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/).
+Chrome users can install our addon from the [Google webstore](https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie).
+
+Once it is installed, you can toggle the `Enabled` switch to turn it off and on.
+It's easiest to leave it running while you browse and it should not interfere with your regular browsing experience.
+
+### 2. Monitor your Snowflake's status and usage
+
+The Snowflake addon will inform you about how many people you have helped in the last 24 hours.
+It will also display an error message if the Snowflake could not connect to clients or the Snowflake bridge.
+---
+html: two-columns-page.html
+---
+key: 2
+---
+subtitle: How to run a Snowflake proxy in your browser
+---
+section: Snowflake
+---
+section_id: snowflake
diff --git a/content/relay/setup/snowflake/contents.lr b/content/relay/setup/snowflake/contents.lr
new file mode 100644
index 0000000..2103d91
--- /dev/null
+++ b/content/relay/setup/snowflake/contents.lr
@@ -0,0 +1,28 @@
+_model: page
+---
+title: Snowflake
+---
+body:
+
+This guide will help you set up a Snowflake proxy to help censored users connect to the Tor network.
+The requirements are:
+1. Internet connectivity
+
+If you don't meet the requirements to run a Tor relay or obfs4 bridge, running a Snowflake proxy is a great way to donate your bandwidth to help users circumvent censorship.
+
+There are a few different options for running a Snowflake proxy.
+---
+html: two-columns-page.html
+---
+key: 5
+---
+section: Snowflake operations
+---
+section_id: snowflake-operations
+---
+subtitle: Run an snowflake proxy to help censored users connect to the Tor network
+---
+_slug: {{snowflake}}
+---
+color: primary
+---
diff --git a/content/relay/setup/snowflake/standalone/contents.lr b/content/relay/setup/snowflake/standalone/contents.lr
new file mode 100644
index 0000000..43cdcb9
--- /dev/null
+++ b/content/relay/setup/snowflake/standalone/contents.lr
@@ -0,0 +1,66 @@
+_model: page
+---
+color: primary
+---
+title: Standalone Snowflake proxy
+---
+body:
+
+This guide will help you set up a standalone Snowflake proxy on a server to help censored users connect to the Tor network.
+The only requirements are internet connectivity, however one of the main advantages of standalone Snowflake proxies is that they can be installed on servers and offer a higher bandwidth and more reliable option for users behind restrictive NATs and firewalls.
+Therefore, we especially recommend:
+1. 24/7 Internet connectivity
+2. A full-cone NAT (you can use this [NAT behaviour tool](https://github.com/pion/stun/tree/master/cmd/stun-nat-behaviour) to test what type of NAT you have.
+The properties you are looking for are address-independent mapping and either address-independent or address-dependent filtering)
+
+There are several ways to setup and run a standalone snowflake proxy.
+
+### Docker setup
+
+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.
+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:
+```
+docker-compose up -d snowflake-proxy
+```
+
+You should now see the output:
+```
+Creating snowflake-proxy ... done
+```
+and your proxy is up and running!
+
+### Ansible
+
+There is now an ansible role to install a Snowflake proxy on Debian [created by Jacobo Nájera](https://lists.torproject.org/pipermail/anti-censorship-team/2021-March/000143.html): https://galaxy.ansible.com/nvjacobo/snowflake
+
+### Compiling and running from source
+
+1. First you will need to install and configure Go to build the standalone proxy-go code.
+If you are running Ubuntu or Debian, you can install Go by executing `apt install golang`.
+Otherwise visit https://golang.org/dl/.
+You will need Go 1.13+ to run the Snowflake proxy.
+
+2. Clone the [source code](#source-code).
+ ```
+ git clone https://git.torproject.org/pluggable-transports/snowflake.git
+ ```
+3. Build the Snowflake proxy.
+ ```
+ go build
+ ```
+4. Run the Snowflake proxy.
+
+For our fallback proxy-go instances on snowflake-broker, [we manage proxy-go instances using runit](https://gitlab.torproject.org/tpo/anti-censorship/team/-/wikis/Survival-Guides/Snowflake-Bridge-Survival-Guide#standalone-proxy-go-instances).
+However, a simpler nohup command will also allow you to run an instance in the background.
+ ```
+ nohup ./proxy &
+ ```
+---
+key: 1
+---
+html: two-columns-page.html
+---
+subtitle: How to run a standalone Snowflake proxy
diff --git a/content/relay-operations/technical-considerations/contents.lr b/content/relay/technical-considerations/contents.lr
similarity index 100%
rename from content/relay-operations/technical-considerations/contents.lr
rename to content/relay/technical-considerations/contents.lr
diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay/types-of-relays/contents.lr
similarity index 100%
rename from content/relay-operations/types-of-relays/contents.lr
rename to content/relay/types-of-relays/contents.lr
diff --git a/content/training/resources/tor-relay-workshop/contents.lr b/content/training/resources/tor-relay-workshop/contents.lr
new file mode 100644
index 0000000..50e292f
--- /dev/null
+++ b/content/training/resources/tor-relay-workshop/contents.lr
@@ -0,0 +1,549 @@
+_model: slideshow
+---
+title: The Tor Network
+---
+_template: slideshow.html
+---
+background: white
+---
+image: /static/images/onion.png
+---
+slides:
+
+#### slide ####
+title: Topics
+----
+description:
+- What is Tor?
+- Types of relays
+- Technical setup
+- More about relays
+- Relay diversity
+- Getting help
+
+
+#### slide ####
+title: What is Tor?
+----
+description:
+- Tor is free software and an open network.
+- Mitigates against tracking, surveillance and censorship.
+- Run by a US non-profit and volunteers from all over the world.
+- It's Tor, not TOR.
+
+
+#### slide ####
+title: The Tor network
+----
+description:
+- An open network that everyone can be a part of.
+- The network is composed of different types of servers run by volunteers around the world.
+- Your server will relay the Tor traffic to another server on the Internet.
+- Before entering the network, your server will automatically go through the relay lifecycle.
+
+
+#### slide ####
+title: Why run a Tor relay?
+----
+description:
+By running a Tor relay, you can help make the Tor network:
+- faster (and therefore more usable)
+- more robust against attacks
+- more stable in case of outages
+- safer for users (spying on more relays is harder than on a few)
+
+
+#### slide ####
+title: Types of Relays
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Guard/middle (aka non-exit) relay
+----
+description:
+- A guard is the first relay in the chain of 3 relays building a Tor circuit.
+- A middle relay is neither a guard nor an exit, but acts as the second hop between them.
+- To become a guard, a middle relay has to be stable and fast (at least 2MByte/s); otherwise, it will remain a middle relay.
+
+
+#### slide ####
+title: Exit relay
+----
+description:
+- The exit relay is the final relay in a Tor circuit, and sends the traffic to its destination.
+- That is why exit relays have the most significant legal exposure and liability of all relays.
+- Before running an exit relay, talk with your local digital rights organization.
+- **You should not run a Tor exit relay from your home.**
+
+
+#### slide ####
+title: Bridge
+----
+description:
+- A bridge is a node in the network that is not listed in the public Tor directory, making it harder for ISPs and governments to block it.
+- Bridges are relatively easy, low-risk, and low bandwidth Tor relays to operate.
+- And there's another special kind of bridge: Pluggable transports. These hide your Tor traffic by adding a layer of obfuscation.
+
+
+#### slide ####
+title: The lifecycle of a new relay
+----
+description:
+Non-exit relays go through a lifecycle of four phases (defined in days):
+- Days 0-3: the unmeasured phase.
+- Days 3-8: network authorities start the remote measurement phase (the ramp-up guard phase).
+- Days 8-68: guard phase (where load counter intuitively drops and then rises higher).
+
+
+#### slide ####
+title: The lifecycle of a new relay
+----
+description:
+- After 68 days, if stable and fast enough, the relay will receive a **Guard flag** (steady-state guard phase).
+- Read about all the phases in: <https://blog.torproject.org/lifecycle-new-relay>
+
+
+#### slide ####
+title: Relay requirements
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Before we start
+----
+description:
+- Never run a relay without the consent of the network administrator or machine owner.
+ Read the Terms of Service (ToS) first, so you don’t risk losing money.
+- Choose which type of relay you will host. A non-exit relay is an easy way to start helping the network.
+- Read the documentation: <https://community.torproject.org/relay>
+
+
+#### slide ####
+title: Bandwidth requirements
+----
+description:
+- It’s recommended to have at least 16 Mbit/s (Mbps) upload and download bandwidth available for Tor. More is better.
+- The minimum requirements for a relay are 10 Mbit/s (Mbps).
+- If you have less than 10 Mbit/s but at least 1 Mbit/s, we recommend running a bridge with obfs4 support.
+
+
+#### slide ####
+title: Monthly outbound traffic
+----
+description:
+- Relays must use at least 100 GByte of outbound/incoming traffic per month.
+- If you have a metered plan, you might want to configure Tor to use only a given amount of bandwidth or monthly traffic.
+- More (>2 TB/month) is better and recommended.
+
+
+#### slide ####
+title: Public IPv4 address
+----
+description:
+- Every relay needs a public IPv4 address - either directly on the host (preferred) or via NAT and port forwarding.
+- The IPv4 address is not required to be static, but static IP addresses are preferred.
+- Your IPv4 address should remain unchanged for at least 3 hours (network consensus).
+- You can only run two Tor relays per public IPv4.
+
+
+#### slide ####
+title: Other requirements
+----
+description:
+- Memory: A <40 Mbit/s non-exit relay should have at least 512 MB of RAM available.
+- Disk storage: Tor does not need much disk storage. A typical Tor relay needs less than 200 MB.
+
+
+#### slide ####
+title: Other requirements
+----
+description:
+- Any modern CPU should be fine.
+- Uptime: Ideally, the relay runs on a server which runs 24/7.
+
+
+#### slide ####
+title: Choosing your relay hosting
+----
+description:
+- The Tor community team maintains GoodBadISPs – a list about the experience of running relays: <https://community.torproject.org/relay/community-resources/good-bad-isps/>
+- Some providers only allow non-exit relays, so check the GoodBadISPs list before buying a service.
+- Running a relay can cost anywhere between a few bucks to hundreds per month.
+
+
+#### slide ####
+title: Technical setup
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Non-exit relay - Debian/Ubuntu
+----
+description:
+- Enable the Tor Project package repository
+- Install the tor package
+
+```
+ $ apt update && apt install tor
+```
+
+
+#### slide ####
+title: Non-exit relay - Debian/Ubuntu
+----
+description:
+- Add relay configuration to the `/etc/tor/torrc` file:
+```
+ Nickname myNiceRelay
+ ExitRelay 0
+ SocksPort 0
+ ControORPort 443
+ lSocket 0
+ ContactInfo tor-operator at your-emailaddress-domain
+ Log notice syslog
+```
+
+
+#### slide ####
+title: Non-exit relay - Debian/Ubuntu
+----
+description:
+- Restart the tor daemon:
+
+```
+ $ systemctl restart tor at default
+```
+
+
+#### slide ####
+title: Non-exit relay - FreeBSD
+----
+description:
+- Install the tor package
+
+```
+ pkg install tor ca_root_nss
+```
+
+
+#### slide ####
+title: Non-exit relay - FreeBSD
+----
+description:
+ - Edit the configuration file `/usr/local/etc/tor/torrc`
+
+```
+ Nickname myNiceRelay
+ ORPort 9001
+ ExitRelay 0
+ SocksPort 0
+ ControlSocket 0
+ ContactInfo tor-operator at your-emailaddress-domain
+ Log notice syslog
+```
+
+
+#### slide ####
+title: Non-exit relay - FreeBSD
+----
+description:
+- Ensure that the random_id sysctl setting is enabled:
+
+```
+ echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf
+ sysctl net.inet.ip.random_id=1
+```
+
+
+#### slide ####
+title: Non-exit relay - FreeBSD
+----
+description:
+- Start the tor daemon and make sure it starts at boot:
+
+```
+ sysrc tor_enable=YES
+ service tor start
+```
+
+
+#### slide ####
+title: Non-exit relay - FreeBSD
+----
+description:
+
+- Optional, but recommended to get package updates faster: <https://community.torproject.org/relay/setup/guard/freebsd/>
+
+
+#### slide ####
+title: Verify that your relay works
+----
+description:
+
+After restarting the service, verify that the log file contains the following entry:
+```
+ Self-testing indicates your ORPort is
+ reachable from the outside.
+ Excellent.
+ Publishing server descriptor.
+```
+
+About 3 hours after you started your relay, it should appear on Metrics portal in Relay Search.
+
+
+#### slide ####
+title: More about relays
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Technical tips
+----
+description:
+- Enable automatic software updates.
+- Backup your Tor Identity Keys.
+- It's possible to limit bandwidth usage (and traffic). Check the parameters, for example, AccountingMax, AccountingRule, AccountingStart.
+- If you run more than one Tor relay, you need to set the MyFamily parameter.
+
+
+#### slide ####
+title: Orchestrating
+----
+description:
+- Running multiple relays by hand can be challenging.
+- Configuration management tools can make relay operators' lives easier:
+- Ansible-relayor: <http://github.com/nusenu/ansible-relayor>
+
+
+#### slide ####
+title: Metrics
+----
+description:
+- Metrics portal: <https://metrics.torproject.org>
+- You can search for how many relays are in the network, how many are exits, etc.
+- In 2021 there are ~6,600 public relays and ~1,500 bridges.
+- Check: how many relays are in your country? Who runs these relays? How diverse are they?
+
+
+#### slide ####
+title: Network diversity
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Monoculture
+----
+description:
+- A single kernel vulnerability in GNU/Linux impacting all Tor relays could be devastating.
+- Diversity of Operating System (OS): ~90% of relays are Linux.
+
+
+#### slide ####
+title: Monoculture
+----
+description:
+- Diversity of Autonomous Systems (AS).
+- Try to avoid the following hosters: OVH SAS (AS16276), Online S.a.s. (AS12876), Hetzner Online GmbH (AS24940), DigitalOcean, LLC (AS14061).
+
+
+#### slide ####
+title: The TorBSD Diversity Project
+----
+description:
+- The Tor BSD Diversity Project (TDP) is an initiative seeking to extend the use of BSD Unix operating systems in the network.
+- Goals: increase the number of Tor relays running BSDs; Engage the BSD community about Tor anonymity; Port Tor related programs to BSD operating systems.
+
+
+#### slide ####
+title: More about exit relays
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Legal information
+----
+description:
+- Many countries have regulations that exclude internet service providers from liability.
+- It's a good idea to consult with a lawyer or your local digital rights organization.
+- Under most circumstances, you will be able to handle legal matters by having an abuse response letter.
+
+
+#### slide ####
+title: Legal resources
+----
+description:
+- The EFF Tor Legal FAQ: <https://community.torproject.org/relay/community-resources/eff-tor-legal-faq/>
+- It's important to respond to abuse complaints in a timely manner (usually within 24 hours).
+- Abuse letter templates: <https://community.torproject.org/relay/community-resources/tor-abuse-templates>
+
+
+#### slide ####
+title: Tips for running an exit relay
+----
+description:
+- Get a separate IP for the relay, and don’t use it for other services.
+- Set up a Tor Exit Notice, so if someone checks your exit IP they'll know that it’s a Tor Exit.
+- If you receive excessive complaints, consider running a Reduced Exit Policy.
+- For more tips: <https://blog.torproject.org/tips-running-exit-node>
+
+
+#### slide ####
+title: Running relays with others
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Running a relay with others
+----
+description:
+- You can work with your university department, employer or institution, or an organization like Torservers.org, Nos oignons, etc.
+- Some organizations – known as Relay Associations – are solely dedicated to this purpose: <https://community.torproject.org/relay/community-resources/relay-associations/>.
+
+
+#### slide ####
+title: Relays associations
+----
+description:
+- It's often advised to create some type of non-profit organization. This is useful for having a bank account and shared ownership.
+- The most important thing is to have a group of people (3-5 suggested to start) interested in helping.
+
+
+#### slide ####
+title: Running a relay with universities
+----
+description:
+- Universities are typically home to a reliable, robust, and well-equipped network.
+- Many computer science departments and university libraries run relays: Massachusetts Institute of Technology, Universität Stuttgart, the University of Waterloo.
+
+#### slide ####
+title: Running a relay with universities
+----
+description:
+- Read more: <https://community.torproject.org/relay/community-resources/tor-relay-universities/>
+
+
+
+#### slide ####
+title: At your company or organization
+----
+description:
+- If you work at a Tor-friendly company or organization, that's another ideal place to run a relay.
+- Companies like Brass Horn Communications, Quintex Alliance Consulting, and many others run relays.
+- And organizations like Digital Courage, Access Now, Derechos Digitales, Calyx Institute, and Lebanon Libraries in New Hampshire.
+
+
+#### slide ####
+title: Bad relays
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: What is a bad relay?
+----
+description:
+- A bad relay is one that either doesn't work properly or tampers with our users' connections. That can be either through maliciousness or misconfiguration.
+
+
+#### slide ####
+title: What is a bad relay?
+----
+description:
+- For example: tampering with exit traffic in any way (including dropping accepted connections). Or, running HSDirs that harvest and probe .onion addresses
+
+
+#### slide ####
+title: Reporting a bad relay
+----
+description:
+- The "Bad relays" private working group at the Tor Project work to detect misconfigured, malicious, or suspicious relays.
+- Users can report bad relays by sending an email to bad-relays at lists.torproject.org with the relay’s IP address or fingerprint, what kind of behavior you see, and any additional information needed to reproduce the issue.
+
+
+#### slide ####
+title: What happens to bad relays?
+----
+description:
+- After a relay is reported and behavior has been verified, the Tor Project will attempt to contact the relay operator.
+- The relay will be flagged to prevent it from being used (BadExit, Invalid, Reject).
+- The working group actively looks for bad relays using open source tools like exitmap, sysbilhunter.
+
+
+#### slide ####
+title: How do I get help running a Tor relay?
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
+
+
+#### slide ####
+title: Getting help
+----
+description:
+- Read the Tor Relay documentation:
+ <https://community.torproject.org/relay>
+- Subscribe to the tor-relays mailing list: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays>
+- Join our IRC channel: #tor-relays in irc.oftc.net
+
+
+#### slide ####
+title: Thank you!
+----
+slide_layout: title-slide
+----
+background_image: /static/images/onion-white.png
+----
+description:
+-
diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr
index c78ca5e..6d13142 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -31,7 +31,7 @@ When we are in Tor training, we listen to the stories people tell us about their
## Describe and Ask for consent
We don't collect names or contact details of interview participants, and any time you're going to receive impressions, surveys, or records, you should ask for their consent to participate - this should be recorded or registered in the form.
-You'd love to read about your experiences during the training, product testing, and interviews. There are a few ways to do this:
+We'd love to read about your experiences during the training, product testing, and interviews. There are a few ways to do this:
* Scenario: describe the process of the test you ran.
* Demographics: While we are not interested in specific characteristics of our audience, or binary attributes, we must know the total reach of your Tor training. You should take [this material]() with you on the day of your research, distribute it among participants, and answer their questions about how to fill it in if they have any.
More information about the tor-commits
mailing list