April 2021 - tor-commits - lists.torproject.org

[community/staging] Relay guide for Windows
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 4dbf1a2f44a92da289f107a6c526fdc316411163 Author: Sehrish Aslam <66127574+SehrishHussain(a)users.noreply.github.com> Date: Wed Apr 7 22:40:20 2021 +0500 Relay guide for Windows Added relay guide for Windows Made suggested corrections Made corrections, and divided into simple sections for translation. Removed trailing spaces Squashed last two commits Final Squashed all three commits --- .../technical-setup/guard/windows/contents.lr | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) 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..8733b55 --- /dev/null +++ b/content/relay-operations/technical-setup/guard/windows/contents.lr @@ -0,0 +1,89 @@ +_model: page +--- +color: primary +--- +title: Windows +--- +body: +# Relay setup guide for Windows 10 + +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. +--- +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 +---

1 0

[community/staging] arranged keys
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit cd82bca90e177d2390382edf2ab89eb634a7f538 Author: kulsoomzahra <kulsoomzahra24(a)gmail.com> Date: Fri Apr 9 12:22:43 2021 +0530 arranged keys --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/docker/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/dragonflybsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/fedora/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/netbsd/contents.lr | 2 +- content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 2 +- .../relay-operations/technical-setup/bridge/post-install/contents.lr | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) 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..270e3ac 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 @@ -133,7 +133,7 @@ html: two-columns-page.html --- key: -2 +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..aaf89fc 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -76,7 +76,7 @@ If you are having trouble setting up your bridge, have a look at [our help secti --- 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 ---

1 0

[community/staging] Add windows instructions: snowflake option, final notes, and fix styling.
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit d7774dc3b1f2ce6563bf00a60a2c37d6b9a453a2 Author: gus <gus(a)torproject.org> Date: Fri Apr 9 11:54:59 2021 -0300 Add windows instructions: snowflake option, final notes, and fix styling. --- .../technical-setup/guard/windows/contents.lr | 34 ++++++++++++---------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/content/relay-operations/technical-setup/guard/windows/contents.lr b/content/relay-operations/technical-setup/guard/windows/contents.lr index 8733b55..2dcd62d 100644 --- a/content/relay-operations/technical-setup/guard/windows/contents.lr +++ b/content/relay-operations/technical-setup/guard/windows/contents.lr @@ -2,13 +2,24 @@ _model: page --- color: primary --- -title: Windows +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: -# Relay setup guide for Windows 10 -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. +**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. @@ -41,7 +52,6 @@ The next step is to download and install Windows Expert bundle as well as set up ``` #Change the nickname "myNiceRelay" to a name that you like Nickname myNiceRelay - ORPort 9001 ExitRelay 0 SocksPort 0 @@ -76,14 +86,8 @@ There are two methods for starting up your relay for the first time depending on 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. ---- -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 ---- + +## 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.

1 0

[community/staging] Add advanced usage instructions for obfs4 docker
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit e1867cb683195a4a41e3a6344a994e247d28c86f Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Apr 12 13:10:35 2021 -0400 Add advanced usage instructions for obfs4 docker We just merged a contribution that allows users to specify arbitrary torrc options for their docker-based obfs4 bridge. This adds instructions for how to configure a bridge with these options and a link to an example .env file. --- .../technical-setup/bridge/docker/contents.lr | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index aaf89fc..6448ba3 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -73,6 +73,17 @@ 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://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/.env) to get started. + --- html: two-columns-page.html ---

1 0

[community/staging] updating user research sections
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit 0f657cfb9248375d3475fe72cbe0d5e591f22b7e Author: nah <nah(a)riseup.net> Date: Mon Apr 12 15:41:14 2021 -0300 updating user research sections --- content/user-research/guidelines/contents.lr | 11 +++-- content/user-research/how-to-volunteer/contents.lr | 54 ++++++++++++++++++++++ content/user-research/reports/contents.lr | 3 ++ 3 files changed, 65 insertions(+), 3 deletions(-) diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index fb6c5f7..ff0586b 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 @@ -64,8 +63,14 @@ Before ending the training, coordinate the feedback with the trainer. The two of 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/comm…. 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/communi… (keep it simple). +2. Upload it to our [Gitlab repository](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/REA…. +3. Create issues in the [Research repository](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/REA…. +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..a3f3f3f --- /dev/null +++ b/content/user-research/how-to-volunteer/contents.lr @@ -0,0 +1,54 @@ +_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/script… +- [Discovery Bridges](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/script… + +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_…, 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/s…, 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_…. +- 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/reports/contents.lr b/content/user-research/reports/contents.lr index 3c1d94a..c03b651 100644 --- a/content/user-research/reports/contents.lr +++ b/content/user-research/reports/contents.lr @@ -31,3 +31,6 @@ We are committed to open design, so you can see the user research we have conduc | 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…: Cameroon, Nigeria, Uganda and Zimbabwe as case studies.

1 0

[community/staging] Update links to gitlab.tpo
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit bb3829c63ee58a710eb5d4ddd6c3dbb99ae5e1ba Author: gus <gus(a)torproject.org> Date: Mon Apr 12 16:11:07 2021 -0300 Update links to gitlab.tpo --- content/relay-operations/technical-setup/bridge/docker/contents.lr | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 6448ba3..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/d…, 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-censorshi…, 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. @@ -82,8 +82,7 @@ OBFS4_ENABLE_ADDITIONAL_VARIABLES=1 OBFS4V_AddressDisableIPv6=1 ``` -You may [download our template .env](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/.env) to get started. - +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 ---

1 0

[community/staging] added space
by gus＠torproject.org 15 Apr '21

15 Apr '21

commit bd95258d545fe5f562b9a348022c2dbdf41d28c9 Author: Anushka Jain <anushkajain2902(a)gmail.com> Date: Tue Apr 13 01:34:49 2021 +0530 added space --- templates/relay-operations.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/relay-operations.html b/templates/relay-operations.html index 7690b3b..1109d78 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -21,7 +21,7 @@ </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Connect with other Relay Operators') }}</h2> - <p class="text-center">{{ _('The best resource of all is the active community of relay operators on tor-relays mailing list and on IRC #tor-relays in irc.oftc.net. ') }}</p> + <p class="text-center">{{ _('The best resource of all is the active community of relay operators on tor-relays mailing list and on IRC') }} <a href="https://webchat.oftc.net/?channels=tor-relays" target="_blank">{{_('#tor-relays') }}</a> {{ _('in irc.oftc.net.') }}</p> <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays"> {{ _('Relay Operators mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> </a>

1 0

[tor/release-0.4.6] Bump to 0.4.6.2-alpha-dev
by nickm＠torproject.org 15 Apr '21

15 Apr '21

commit e6d9dd91577890dca0380e70ae65d3afe1f7dacb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 15 12:42:23 2021 -0400 Bump to 0.4.6.2-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index bd7de5dfc9..b821533654 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.6.2-alpha]) +AC_INIT([tor],[0.4.6.2-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-04-14"], # for 0.4.6.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-04-15"], # for 0.4.6.2-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index cf50087c7a..8a3bc0ba32 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.6.2-alpha" +!define VERSION "0.4.6.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index bc260bd7ed..c930c49ba4 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.2-alpha" +#define VERSION "0.4.6.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Bump to 0.4.6.2-alpha-dev
by nickm＠torproject.org 15 Apr '21

15 Apr '21

commit e6d9dd91577890dca0380e70ae65d3afe1f7dacb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 15 12:42:23 2021 -0400 Bump to 0.4.6.2-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index bd7de5dfc9..b821533654 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.6.2-alpha]) +AC_INIT([tor],[0.4.6.2-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-04-14"], # for 0.4.6.2-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-04-15"], # for 0.4.6.2-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index cf50087c7a..8a3bc0ba32 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.6.2-alpha" +!define VERSION "0.4.6.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index bc260bd7ed..c930c49ba4 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.2-alpha" +#define VERSION "0.4.6.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/master] Add 0.4.6 to git-list-tor-branches.sh
by nickm＠torproject.org 15 Apr '21

15 Apr '21

commit d6ebd8160d23f8025b4e384b3ff4937a28ac2296 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 15 12:40:45 2021 -0400 Add 0.4.6 to git-list-tor-branches.sh --- scripts/git/git-list-tor-branches.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/git/git-list-tor-branches.sh b/scripts/git/git-list-tor-branches.sh index 2bcd4722b4..496b774acd 100755 --- a/scripts/git/git-list-tor-branches.sh +++ b/scripts/git/git-list-tor-branches.sh @@ -145,6 +145,9 @@ branch release-0.4.4 branch maint-0.4.5 branch release-0.4.5 +branch maint-0.4.6 +branch release-0.4.6 + branch master finish

1 0