[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [community/translations] update tranlations branch content



commit 50f2edc69685d81dc9a1578c1809242f491c4861
Author: emma peel <emma.peel@xxxxxxxxxx>
Date:   Wed May 12 13:16:11 2021 +0200

    update tranlations branch content
---
 .../community-resources/good-bad-isps/contents.lr  |  5 +-
 .../technical-considerations/contents.lr           |  7 +-
 .../bridge/centos-rhel-opensuse/contents.lr        |  4 +-
 .../bridge/debian-ubuntu/contents.lr               |  2 +-
 .../technical-setup/bridge/docker/contents.lr      | 14 +++-
 .../bridge/dragonflybsd/contents.lr                |  2 +-
 .../technical-setup/bridge/fedora/contents.lr      |  2 +-
 .../technical-setup/bridge/freebsd/contents.lr     |  2 +-
 .../technical-setup/bridge/netbsd/contents.lr      |  2 +-
 .../technical-setup/bridge/openbsd/contents.lr     |  2 +-
 .../bridge/post-install/contents.lr                |  2 +-
 .../technical-setup/guard/fedora/contents.lr       | 12 ++-
 .../technical-setup/guard/windows/contents.lr      | 93 ++++++++++++++++++++++
 content/user-research/guidelines/contents.lr       | 30 +++++--
 content/user-research/how-to-volunteer/contents.lr | 70 ++++++++++++++++
 content/user-research/open/contents.lr             | 21 +----
 content/user-research/persona/contents.lr          | 11 +--
 content/user-research/reports/contents.lr          | 36 +++++++++
 18 files changed, 265 insertions(+), 52 deletions(-)

diff --git a/content/relay-operations/community-resources/good-bad-isps/contents.lr b/content/relay-operations/community-resources/good-bad-isps/contents.lr
index dc4bb3c..f5c4280 100644
--- a/content/relay-operations/community-resources/good-bad-isps/contents.lr
+++ b/content/relay-operations/community-resources/good-bad-isps/contents.lr
@@ -21,7 +21,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou
  * Hetzner Online GmbH (AS24940)
  * DigitalOcean, LLC (AS14061)
 
-**Note**: This page is currently being revamped. If you would like to help out please see [#31063](https://trac.torproject.org/projects/tor/ticket/31063).
+**Note**: This page is currently being revamped. If you would like to help out please see [#72](https://gitlab.torproject.org/tpo/web/community/-/issues/72).
 
 # Good Experiences
 
@@ -213,7 +213,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou
 
 | **Company/ISP** | **ASN** | **Bridges** | **Relay** | **Exit** | **Comments** | **Last Updated** |
 |-------------------------|-------------|-----------------|--------------|-------------|---------------------|------------------------|
-| [Hitme.net.pl](http://hitme.net.pl/) | - | Yes | Yes | Yes | - | 12/06/2017 |
+| [Hitme.pl](http://hitme.pl/) | - | Yes | Yes | No | They block accounts if you receive an abuse report | 29/03/2021 |
 | [Hostowisko.pl](http://www.hostowisko.pl/) | - | Yes | Yes | ? | -  | 27/08/2013 |
 | [Exone](http://www.exone.pl/) | - | Yes | Yes | ? | - | 28/08/2013 |
 | [e24cloud](http://www.e24cloud.com/en) | - | Yes | Yes | ? | - | 01/10/2013 |
@@ -243,6 +243,7 @@ For network diversity and stronger anonymity, you should avoid providers and cou
 | [PRQ](http://prq.se/?p=dedicated&intl=1) |  - | Yes | Yes | Yes | - | - |
 | [Portlane](http://www.portlane.com/) | - | Yes | Yes | Yes | Previously provided connectivity for ThePirateBay, OpenBitTorrent tracker et al.  Handles abuse according to "Swedish praxis". |  - |
 | [Yourserver](https://www.yourserver.se/) | - | Yes | Yes | ? | Support team will allow relay/exit but TOR Traffic is throttled to 5Mbps speed. If your Exit relay receive too much complaints, they will ask to you to stop or otherwise they will suspend. | 2015/03/06 |
+| [Svea Hosting](https://svea.net/) | AS41634 | Yes | Yes | Yes | They run an exit node themselves and write on their dedicated server page "It is perfect for [...] TOR Exit Nodes"  | 04/2021 |
 
 
 ### Switzerland
diff --git a/content/relay-operations/technical-considerations/contents.lr b/content/relay-operations/technical-considerations/contents.lr
index 33ae63e..83906f3 100644
--- a/content/relay-operations/technical-considerations/contents.lr
+++ b/content/relay-operations/technical-considerations/contents.lr
@@ -19,7 +19,7 @@ If you do not own physical hardware, you could run a relay on a rented dedicated
 This can cost anywhere between $3.00/month and thousands per month, depending on your provider, hardware configuration, and bandwidth usage.
 Many VPS providers will not allow you to run exit relays.
 You must follow the VPS provider's terms of service, or risk having your account disabled.
-For more information on hosting providers and their policies on allowing Tor relays, please see this list maintained by the Tor community: [GoodBadISPs](/relay/community-resources/good-bad-isps).
+For more information on hosting providers and their policies on allowing Tor relays, please see this list maintained by the Tor community: [GoodBadISPs](../community-resources/good-bad-isps/).
 
 ## Questions to consider when choosing a host
 
@@ -27,7 +27,8 @@ For more information on hosting providers and their policies on allowing Tor rel
 * Does the hoster provide IPv6 connectivity? It is recommended, but not required.
 * What virtualization / hypervisor (if any) does the provider use? Anything but OpenVZ should be fine.
 * Does the hoster start to throttle bandwidth after a certain amount of traffic?
-* How well connected is the autonomous system of the hoster? To answer this question you can use the AS rank of the autonomous systems if you want to compare: (a lower value is better) http://as-rank.caida.org/
+* How well connected is the autonomous system of the hoster?
+  To answer this question you can use the AS rank of the autonomous systems if you want to compare: (a lower value is better) <http://as-rank.caida.org/>
 
 ## If you plan to run exit relays
 
@@ -35,7 +36,7 @@ For more information on hosting providers and their policies on allowing Tor rel
 * Does the hoster allow custom WHOIS records for your IP addresses? This helps reduce the amount of abuse sent to the hoster instead of you.
 * Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record)
 
-  You can usually ask these questions in a Pre-Sales ticket.
+You can usually ask these questions in a Pre-Sales ticket.
 
 # AS/location diversity
 
diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
index 7701282..f31d12e 100644
--- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
@@ -131,9 +131,7 @@ If your bridge is now running, check out the [post-install notes](https://commun
 ---
 html: two-columns-page.html
 ---
-key:
-
-2
+key: 1
 ---
 subtitle: How to deploy an obfs4 bridge on CentOS / RHEL / OpenSUSE
 ---
diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
index 4d25952..76926a9 100644
--- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
@@ -86,7 +86,7 @@ If you are having trouble setting up your bridge, have a look at [our help secti
 If your bridge is now running, check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/).
 
 ---
-key: 1
+key: 2
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr
index 00e26a1..85ffb24 100644
--- a/content/relay-operations/technical-setup/bridge/docker/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr
@@ -9,7 +9,7 @@ body:
 ### 1. Deploy a container
 
 We provide a docker-compose file that helps you deploy the container.
-First, [download docker-compose.yml](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/docker-compose.yml), and then write your bridge configuration to a new file, `.env`, which is in the same directory as `docker-compose.yml`. Here's a template:
+First, [download docker-compose.yml](https://gitlab.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/docker-compose.yml), and then write your bridge configuration to a new file, `.env`, which is in the same directory as `docker-compose.yml`. Here's a template:
 
 ```
 # Your bridge's Tor port.
@@ -73,10 +73,20 @@ obfs4 1.2.3.4:1234 B0E566C9031657EA7ED3FC9D248E8AC4F37635A4 cert=OYWq67L7MDApdJC
 Make sure to check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/).
 If you are having trouble setting up your bridge, have a look at [our help section](https://community.torproject.org/relay/getting-help/).
 
+### 4. Advanced usage
+
+You may set additional torrc variables in your `.env` file by setting `OBFS4_ENABLE_ADDITIONAL_VARIABLES` to 1 and prefixing the desired torrc options with `OBFS4V_`. For example, to set the `AddressDisableIPv6` option, include the following lines in your `.env`:
+
+```
+OBFS4_ENABLE_ADDITIONAL_VARIABLES=1
+OBFS4V_AddressDisableIPv6=1
+```
+
+You may [download our template .env](https://gitlab.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/.env) to get started.
 ---
 html: two-columns-page.html
 ---
-key: 5
+key: 3
 ---
 subtitle: How to deploy an obfs4 bridge using a docker container
 ---
diff --git a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr
index 8a0c15e..1027a79 100644
--- a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr
@@ -6,7 +6,7 @@ title: DragonflyBSD
 ---
 html: two-columns-page.html
 ---
-key: 5
+key: 4
 ---
 body:
 
diff --git a/content/relay-operations/technical-setup/bridge/fedora/contents.lr b/content/relay-operations/technical-setup/bridge/fedora/contents.lr
index 6708a92..095bac2 100644
--- a/content/relay-operations/technical-setup/bridge/fedora/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/fedora/contents.lr
@@ -105,7 +105,7 @@ html: two-columns-page.html
 ---
 key:
 
-2
+5
 ---
 subtitle: How to deploy an obfs4 bridge on Fedora
 ---
diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
index 29baea0..5d182d8 100644
--- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
@@ -6,7 +6,7 @@ title: FreeBSD
 ---
 html: two-columns-page.html
 ---
-key: 3
+key: 6
 ---
 body:
 
diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr
index a9799cd..c681497 100644
--- a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr
@@ -6,7 +6,7 @@ title: NetBSD
 ---
 html: two-columns-page.html
 ---
-key: 6
+key: 7
 ---
 body:
 
diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
index d5ef072..0a60051 100644
--- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr
@@ -6,7 +6,7 @@ color: primary
 ---
 html: two-columns-page.html
 ---
-key: 4
+key: 8
 ---
 body:
 
diff --git a/content/relay-operations/technical-setup/bridge/post-install/contents.lr b/content/relay-operations/technical-setup/bridge/post-install/contents.lr
index 4abc2ea..e0aea26 100644
--- a/content/relay-operations/technical-setup/bridge/post-install/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/post-install/contents.lr
@@ -21,7 +21,7 @@ Finally, you can monitor your obfs4 bridge's usage on [Relay Search](https://met
 ---
 html: two-columns-page.html
 ---
-key: 6
+key: 9
 ---
 subtitle: How to find your bridge in Relay Search and connect manually
 ---
diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr
index 7152ca7..795fe98 100644
--- a/content/relay-operations/technical-setup/guard/fedora/contents.lr
+++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr
@@ -10,7 +10,7 @@ body:
 
 One of the most important things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. Follow the instructions to enable [automatic software updates](updates) for your operating system.
 
-# 2.  # 3. Add the following to /etc/yum.repos.d/tor.repo and then install the tor package.
+# 2. Add the following to `/etc/yum.repos.d/tor.repo` and then install the tor package.
 
 ```
 [tor]
@@ -22,7 +22,12 @@ gpgkey=https://rpm.torproject.org/fedora/public_gpg.key
 cost=100
 ```
 
-# 3. Put the tor configuration file `/etc/tor/torrc` in place
+`sudo dnf install tor`
+
+
+# 3. Configuration File
+
+Put the configuration file `/etc/tor/torrc` in place:
 
 ```
 #change the nickname "myNiceRelay" to a name that you like
@@ -42,7 +47,8 @@ systemctl start tor
 
 # 5. Final notes
 
-If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/). If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
+If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay-operations/technical-setup/guard/windows/contents.lr b/content/relay-operations/technical-setup/guard/windows/contents.lr
new file mode 100644
index 0000000..2dcd62d
--- /dev/null
+++ b/content/relay-operations/technical-setup/guard/windows/contents.lr
@@ -0,0 +1,93 @@
+_model: page
+---
+color: primary
+---
+title: Windows 10
+---
+html: two-columns-page.html
+---
+key: 8
+---
+section: Middle/Guard relay
+---
+section_id: relay-operations
+---
+subtitle: How to deploy a middle/Guard relay on Windows
+---
+body:
+
+**Note: You should only run a Windows relay if you can run it 24/7. If the operator is unable to guarantee that, a [Snowflake](https://snowflake.torproject.org/) is a better way to contribute resources.**
+
+Setting up a Windows system as a relay requires performing a few simple steps to set up a user account, download the expert bundle, implement a torrc configuration file and start up Tor from the command line.
+Below are detailed instructions on how to perform these steps - please ensure you follow them very carefully, and make any of the necessary modifications outlined along the way.
+
+# 1. Creating a user account for Tor
+First you will need to create a new account to allow Tor to run isolated from your personal configuration as well as have manageable system permissions.
+
+1. To begin, open your Control Panel and select 'Accounts'.
+2. On the left-side menu, select 'Family & other people'.
+3. Beside the 'Add another user to this PC' subheader, click the large `+` sign.
+4. A panel will now appear asking for the Windows account information. On the bottom, select the small text that states "I do not have this users sign-in information".
+5. On the next panel, select the similar text on the bottom stating "Set up user without using a Microsoft account".
+6. Enter a username for the user. Anything you like is fine, though within this guide the username `torrelay` will  be used. Then enter a strong password and continue.
+
+# 2. Downloading and configuring the Windows Expert bundle
+
+## 2.1 Downloading
+
+The next step is to download and install Windows Expert bundle as well as set up your torrc file.
+
+1. Head over to [Download Tor Source code]( https://www.torproject.org/download/tor/) and scroll down to select 'Windows Expert Bundle'. 
+2. Head to your `C:\Users\torrelay\` directory. 
+3. Create a folder called `tor`.
+*(Optional. A custom path can be used, though you will have to make necessary modifications in the following steps.)
+
+## 2.2 Configuration 
+
+1. Unpack the zipped Expert bundle into your newly created Tor directory. Two files will be placed there; one called `Tor`, and the other `Data`.
+2. You will now need to create a torrc file to define the ruleset of your relay. 
+3. The default directory path for this file is `C:\Users\torrelay\AppData\Roaming\tor\torrc`, though you can specify a custom location at commandline startup with the `-f` flag. (More below)
+4. Open up your newly created `torrc` file in your text editor and populate it with the following contents:
+
+```
+#Change the nickname "myNiceRelay" to a name that you like
+Nickname myNiceRelay
+ORPort 9001
+ExitRelay 0
+SocksPort 0
+#Paths assume you extracted to C:\Users\torrelay\tor - if you 
+#extracted elsewhere or used a different username, adjust the 
+#paths accordingly
+DataDirectory C:\Users\torrelay\tor\Data
+Log notice file C:\Users\torrelay\tor\log\notices.log
+GeoIPFile C:\Users\torrelay\tor\Data\Tor\geoip
+GeoIPv6File C:\Users\torrelay\tor\Data\Tor\geoip6
+#Put your email below - Note that it will be published on the metrics page
+ContactInfo tor-operator@your-emailaddress-domain
+```
+
+Make sure everything is filled in correctly, then save and exit.
+
+# 3. Starting up your relay
+
+There are two methods for starting up your relay for the first time depending on your preferences and needs.
+
+### 3.1 Method 1: User interface
+
+1. Navigate to the directory you extracted Tors files.
+2. Simply right-click on the `tor.exe` file and select 'Run as other user' from the drop-down menu, and enter the password for your Tor account when prompted.
+* **Note:** Be sure **not** to click the 'Run as administrator' button - this is dangerous! 
+
+### 3.2 Method 2: Command line
+
+1. Open your command prompt. Navigate to `C:\Users\user\torrelay\tor\Tor` with the command `cd C:\Users\user\torrelay\tor\Tor`.
+2. Type `RUNAS /user:torrelay tor.exe` and press enter. If you have your `torrc` file somewhere other than the default location (Like the `home` folder), specify the path with the `-f` flag.
+* Example: `RUNAS /user:torrelay tor.exe -f C:\Users\user\torrelay\tor\Tor\torrc`
+3. You should now see Tor starting up in your terminal. Wait until its finished bootstrapping. 
+4. After a short period it should publish its OrPort, and you will be successfully relaying traffic for the Tor Network.
+ * **Notice:** Depending on your systems settings, Tor may fail to start and produce an error indicating it is unable to create files. If this occurs, simply open the Windows Defender Security Center and select "App & browser control". Add the tor.exe file to the permissions list, then rerun `tor.exe` from the command line. Tor should now start up normally.
+
+## 4. Final notes
+
+If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/).
+If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes.
diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr
index fb6c5f7..c78ca5e 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,7 +8,6 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
->>>>>>> parent of 1e624ba... update content status
 key: 3
 ---
 html: two-columns-page.html
@@ -36,18 +35,21 @@ You'd love to read about your experiences during the training, product testing,
 
 * 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.
-* Interview Process: Thank the participant for their willingness to participate in this process and explain that we are testing the product, not them. The interview should not last longer than 20 minutes, you can record if you wish, but you can also take notes on the printed material you will carry with you (or on your computer). Thank the participant again and end the interview.
+* Interview Process: Thank the participant for their willingness to participate in this process and explain that we are testing the product, not them.
+The interview should not last longer than 20 minutes, you can record if you wish, but you can also take notes on the printed material you will carry with you (or on your computer).
+Thank the participant again and end the interview.
 Send us the result - you don't have to write a report, we can do this data analysis with the material you collected.
 
-
 ## Coordinate with the trainer and the Tor UX team
 You're not doing all this work alone - we will support you with meetings, guides, and mentorship if you want. You can join us at any time on our IRC channel #tor-ux and our [mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux).
 
-You must be aligned about the agenda and time to run interviews (if that is the case) during the end of the training. **We strongly recommend that you go through the program of the exercise with the trainer**. Also, we want you two to coordinate feedback together â?? both for you and for your audience.
+You must be aligned about the agenda and time to run interviews (if that is the case) during the end of the training. **We strongly recommend that you go through the program of the exercise with the trainer**.
+Also, we want you two to coordinate feedback together - both for you and for your audience.
 
 At the beginning of the training, be sure to let everyone know what is your role there and why you're taking notes on the practice.
 
 ## Get prepared!
+
 Print and bring with you the material that you will need to run the research - that will probably be something like:
 
 * Demographics
@@ -59,13 +61,25 @@ It is easier to have this material printed and in hand, but if you prefer, you c
 Keep in mind that you might not have Internet access at the venue, so if you're going to install a Tor feature with someone during the interview, you may need to have it downloaded before the training.
 
 ## Report to Tor UX team
-Before ending the training, coordinate the feedback with the trainer. The two of you should work together to hand out post-its for the audience, you can give each participant post-it of a different color per question and ask them to fill it with what they think about: 1. the service they just learned; 2. Tor project; and 3. Tor in general. It can also be questions - keep in mind that any feedback is a good feedback.
 
-It is very important for us to hear back from you. We want to know how the training and the research was for you, how we can improve our support and also, if you want to keep running Tor User Research. We will ask you to fill a form at the end of the research, so we can get your address to send to you a researcher kit (t-shirt and stickers).
+Before ending the training, coordinate the feedback with the trainer.
+The two of you should work together to hand out post-its for the audience, you can give each participant post-it of a different color per question and ask them to fill it with what they think about: 1. the service they just learned; 2. Tor project; and 3. Tor in general.
+It can also be questions - keep in mind that any feedback is a good feedback.
+
+It is very important for us to hear back from you.
+We want to know how the training and the research was for you, how we can improve our support and also, if you want to keep running Tor User Research.
+We will ask you to fill a form at the end of the research, so we can get your address to send to you a researcher kit (t-shirt and stickers).
 We hope to hear back from you very soon!
 
-We will send you our document on **how to report** to the UX team, so please [get in touch](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux) with us to get it.
-If you think you won't have time to gather and report in this format, we would love to have another way to get the material you collected. You can take pictures or send your ´raw´ notes for us.
+Before your session, read and print this material on [User Research Reporting](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/community/user_research_reporting.md).
+If you don't think you'll have time to report in this format, we will happily accept your findings another way - for example, you can take pictures or send your 'raw' notes to us.
+
+### How to submit your findings
+
+1. Write your [report](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/community/user_research_reporting.md) (keep it simple).
+2. Upload it to our [Gitlab repository](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/README.md).
+3. Create issues in the [Research repository](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/README.md).
+4. UX team will discuss each issue and forward it to developers when necessary.
 
 ## Additional links
 
diff --git a/content/user-research/how-to-volunteer/contents.lr b/content/user-research/how-to-volunteer/contents.lr
new file mode 100644
index 0000000..754db35
--- /dev/null
+++ b/content/user-research/how-to-volunteer/contents.lr
@@ -0,0 +1,70 @@
+_model: page
+---
+title: How to Volunteer
+---
+body:
+
+## Where to start
+
+If this is your first time running a User Research session for the Tor Project, we recommend starting with one of these studies. Both can be conducted on a rolling basis and ran remotely.
+
+- [Usability Testing Tor Browser Desktop](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/4._Tor_Browser_Desktop_-_download__launch__browse.pdf)
+- [Discovery Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/discovery-bridges.md)
+
+After choosing which study to run, open an issue in our [GitLab page](https://gitlab.torproject.org/tpo/ux/research).
+Add the title of your research, then select the Usability Testing template option and fill it in.
+Please remember to update the issue as your research evolves.
+
+Not all of the data collected in our research is disclosed to the public, but our general findings are.
+To protect our participants' privacy we take care to anonymize their responses and avoid recording our sessions.
+
+If you're already familiar with the Tor Project and user testing, have a look at our [current needs for user research](https://community.torproject.org/user-research/open/) and see which study better suits you.
+Remember to drop us an email telling us about your plans so we can follow and support your research.
+
+As a volunteer we also ask that you read and follow our [Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt), as well our [Guidelines for Research](https://community.torproject.org/user-research/guidelines/).
+
+**Why do we run Demographics?** 
+We don't collect personal data in our [Demographics](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md), and all questions are optional.
+We believe it's important to collect basic demographics to help us understand if we are meeting our mission regarding diversity and inclusion.
+In addition, collecting these demographics is required for specific studies to support human rights.
+
+**We don't trick participants.** We don't use trick questions in our research.
+We expect participants to be honest with us, and we must be honest about our questions in return.
+As a transparent research space our surveys, studies, and reports are all public, and participants are free to view past studies prior to taking part - however they are not advised to do so.
+
+**We don't track participants.** We care about your privacy and security.
+If we invite you to participate in a study, we won't track you and any recordings will be erased after the report is complete.
+We advise volunteers not to record their sessions at all.
+
+**Open source for privacy.**
+We use free and open source software to analyze our data, and we recommend our volunteers do the same.
+We also ask anyone running research not use software hosted by third parties like cloud providers.
+
+**Decision-making process.** We don't have a single model for decision making.
+After conducting your research, it's normal to be excited to see your feedback implemented as soon as possible.
+However all feedback must be discussed internally across the different teams at the Tor Project first.
+This means that it's often necessary to run the same research more than once to validate your findings, and meet the expectations of the engineers, developers, designers, researchers and others at Tor.
+Please read our [Guidelines](https://community.torproject.org/user-research/guidelines/) to get to know this process more.
+
+## Checklist
+
+- Read the guidelines on [how to do user research with Tor](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/README.md).
+- Read and follow our [Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt).
+- If you don't have one yet, [request a Gitlab account](https://support.torproject.org/misc/bug-or-feedback/).
+- Open an issue in the [UX Research Repository](https://gitlab.torproject.org/tpo/ux/research/-/issues). 
+- Subscribe to the [UX mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo).
+- Learn more about our users by reading [Tor's user personas](https://community.torproject.org/user-research/persona).
+---
+color: primary
+---
+html: two-columns-page.html
+---
+image: eye
+---
+key: 5
+---
+section: user research
+---
+section_id: user research
+---
+subtitle: We care about privacy and security.
diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr
index 813cde3..91d34df 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -18,7 +18,8 @@ html: two-columns-page.html
 ---
 body:
 
-These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines).
+These are our current needs for testing Tor products, as well as methodologies and testing scripts.
+Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines).
 
 ### Tor Browser for Desktop
 * [Tor Browser Usage](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/browser-usage.md)
@@ -33,21 +34,3 @@ These are our current needs for testing Tor products, as well as methodologies a
 
 ### Emma
 * [Run Emma Network Test](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/run-emma.md)
-
-### Other Research
-* [Censored Continent: Understanding the use of tools during Internet censorship in Africa: Cameroon, Nigeria, Uganda and Zimbabwe as case studies.](https://research.torproject.org/techreports/icfp-censored-continent-2020-07-31.pdf)
-
-
-## Past User Research
-Weâ??re committed to open design, so you can see the user research weâ??ve conducted in the global-south. If you want to run user research with us, please [get in touch.](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)
-
-| Project  | Methodology | Locations | Dates | Reporting |
-| -------- | ----------- | --------- | --------- | ----- |
-| Discovery: Get Bridges | User Discovery ([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/discovery-bridges.md)) | Online | Q420, Q121 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/User_Research_-_Bridges.pdf) |
-| Tor Users Demographics | Survey ([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md)) | Online  | 2020 | n/a |
-| User Research: Security Settings | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/2.Tor_Browser_Desktop_-_Security_Settings.pdf)) | Multiple locations | 2019 | n/a |
-| Tor Launcher | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/1.India_User_testing_Tor_Launcher_Test.pdf)) | Mumbai(IN) | Q118 | .pdf |
-| Onion Security Indicator | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/2.User_testing_.onion_states_Test.pdf)) | Mumbai(IN), Kampala(UG), Valencia(ES), Mombasa(KE)| Q118, Q218 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
-| TB Circuit Display | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/3.User_testing_circuit_display_Test.pdf)) | Kampala(UG), Nairobi(KE), Mombasa(KE) | Q118, Q218 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
-| Tor Browser for Desktop | User needs discovery ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE)  | 2018 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
-| Tor Browser for Android | User needs discovery ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE)  | 2018 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
diff --git a/content/user-research/persona/contents.lr b/content/user-research/persona/contents.lr
index 147cee9..33efd66 100644
--- a/content/user-research/persona/contents.lr
+++ b/content/user-research/persona/contents.lr
@@ -15,13 +15,14 @@ key: 4
 html: two-columns-page.html
 ---
 body:
+
 Persona is a tool that represents the needs, thoughts, and goals of the target user. We created personas because they help us to drive â??human-centered design processes.
 As part of our global south travels during 2018 and 2019, we got the lucky chance to meet a lot of different Tor users: from activists to journalists, all of them with different motivations, but demanding a usable private and secure tool to access the Internet.
 With the Community Team, we have been working collecting and mapping real user stories and finding patterns across them. It is how our Personas emerged from our in field research.
 
 ### Tor Personas
-* [Jelani, the human rights defender](https://dip.torproject.org/torproject/ux/research/tree/master/persona/jelani.pdf)
-* [Aleisha, the privacy looker](https://dip.torproject.org/torproject/ux/research/tree/master/persona/aleisha.pdf)
-* [Fernanda, the feminist activist](https://dip.torproject.org/torproject/ux/research/tree/master/persona/fernanda.pdf)
-* [Fatima, the censored user](https://dip.torproject.org/torproject/ux/research/tree/master/persona/fatima.pdf)
-* [Alex, the fearless journalist](https://dip.torproject.org/torproject/ux/research/tree/master/persona/alex.pdf)
+* Jelani, the human rights defender: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona/jelani.pdf) · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/jelani.pdf)
+* Aleisha, the privacy looker: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona/aleisha.pdf) · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/aleisha.pdf)
+* Fernanda, the feminist activist: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona/fernanda.pdf) · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/fernanda.pdf)
+* Fatima, the censored user: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona/fatima.pdf) · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/fatima.pdf)
+* Alex, the fearless journalist: [View on Gitlab](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/persona/alex.pdf) · [Download PDF](https://gitlab.torproject.org/tpo/ux/research/-/raw/master/persona/alex.pdf)
diff --git a/content/user-research/reports/contents.lr b/content/user-research/reports/contents.lr
new file mode 100644
index 0000000..c03b651
--- /dev/null
+++ b/content/user-research/reports/contents.lr
@@ -0,0 +1,36 @@
+section: user research
+---
+section_id: user-research
+---
+color: primary
+---
+image: eye
+---
+_template: layout.html
+---
+title: Reports
+---
+subtitle: We are committed to open design, so you can see the user research we have conducted within our community.
+---
+key: 5
+---
+html: two-columns-page.html
+---
+body:
+
+We are committed to open design, so you can see the user research we have conducted in the global-south. If you want to run user research with us, please [get in touch.](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux)
+
+
+| Project  | Methodology | Locations | Dates | Reporting |
+| -------- | ----------- | --------- | --------- | ----- |
+| Discovery: Get Bridges | User Discovery ([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/discovery-bridges.md)) | Online | Q420, Q121 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2021/User_Research_-_Bridges.pdf) |
+| Tor Users Demographics | Survey ([.md](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md)) | Online  | 2020 | n/a |
+| User Research: Security Settings | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2019/2.Tor_Browser_Desktop_-_Security_Settings.pdf)) | Multiple locations | 2019 | n/a |
+| Tor Launcher | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/1.India_User_testing_Tor_Launcher_Test.pdf)) | Mumbai(IN) | Q118 | .pdf |
+| Onion Security Indicator | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/2.User_testing_.onion_states_Test.pdf)) | Mumbai(IN), Kampala(UG), Valencia(ES), Mombasa(KE)| Q118, Q218 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
+| TB Circuit Display | Usability testing ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/3.User_testing_circuit_display_Test.pdf)) | Kampala(UG), Nairobi(KE), Mombasa(KE) | Q118, Q218 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_kenya_2018_Feature_report__Onions_and_Circuit_Display.pdf) |
+| Tor Browser for Desktop | User needs discovery ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE)  | 2018 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
+| Tor Browser for Android | User needs discovery ([.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2018/4.00_user_needs_discovery.pdf)) | Bogotá(CL), Cali(CL), Valle del Cauca(CL), Kampala(UG), Hoima(UG), Nairobi(KE)  | 2018 | [.pdf](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/reports/2018/ur_colombia_2018_report_tbb-tba.pdf) |
+
+### Community Research
+* [Censored Continent - Understanding the use of tools during Internet censorship in Africa](https://research.torproject.org/techreports/icfp-censored-continent-2020-07-31.pdf): Cameroon, Nigeria, Uganda and Zimbabwe as case studies.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits