October 2019 - tor-commits - lists.torproject.org

[community/develop] Merge branch 'aadibajpai'
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit a98fe1c251eb9ded6e4aab6a62e9b7165ae4cc89 Merge: 8701e87 d556fe5 Author: gus <gus(a)torproject.org> Date: Mon Sep 23 14:19:18 2019 -0400 Merge branch 'aadibajpai' content/onion-services/setup/contents.lr | 4 ++-- databags/pagenav+en.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[community/develop] Update contents.lr
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit aa02a195d6aed33e0bf1d32040ef93db519438eb Author: Stephanie A. Whited <steph(a)torproject.org> Date: Fri Sep 20 08:04:01 2019 +0000 Update contents.lr --- content/onion-services/overview/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/onion-services/overview/contents.lr b/content/onion-services/overview/contents.lr index c85306f..e747052 100644 --- a/content/onion-services/overview/contents.lr +++ b/content/onion-services/overview/contents.lr @@ -24,7 +24,7 @@ Onion services offer various privacy and security benefits to their users. ### Location hiding -An onion service's IP is hidden. Onion services are an overlay network on top of TCP/IP/, so in some sense IP addresses are not even meaningful to onion services: they are not even used in the protocol. +An onion service's IP is hidden. Onion services are an overlay network on top of TCP/IP, so in some sense IP addresses are not even meaningful to onion services: they are not even used in the protocol. ### End-to-end authentication

1 0

[community/develop] Fix Heading
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 8701e8702103f8bc5dcfbfdef8dd024f779e0502 Author: Aadi Bajpai <me(a)aadibajpai.me> Date: Sat Sep 21 06:43:33 2019 +0530 Fix Heading The heading wasn't being rendered correctly. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f196cd5..b7dee2b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Community portal -This is the repository of Community portal. The current online version of this portal can be found at [https://community.torproject.org](https://community.torproject.org) or [Community Onion Service](http://3gldbgtv5e4god56.onion/). +This is the repository of Community portal. The current online version of this portal can be found at https://community.torproject.org or [Community Onion Service](http://3gldbgtv5e4god56.onion/). To clone the code use either of @@ -78,7 +78,7 @@ This is the workflow that Tor Internal people should use when making changes on 5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… 6. Merger should then move the the ticket to the `Closed` column. -### Reviewer Workflow +### Reviewer Workflow 1. Review the page on lektor-staging 2. Review the content on your repo's develop branch and use the gitlab edit button to make any changes.

1 0

[community/develop] Update Workflows
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 640f299baa6b40201bd97d0a9b0e8d6aa739ca6a Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Sep 20 12:12:52 2019 +0200 Update Workflows --- README.md | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index cf1d9de..1bc2893 100644 --- a/README.md +++ b/README.md @@ -64,20 +64,45 @@ If you want to contribute to the Community portal, we will be happy to help you. ## Our Workflows -### Internal Workflow +### Tor Internal Workflow This is the workflow that Tor Internal people should use when making changes on the Community Portal: -1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. -2. To view your changes on the website, you can either run lektor locally, or push to `develop` branch. -3. Once you are happy with your work, push your changes to `staging` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. e.g +``` +# Start a new feature +git checkout -b new-feature master +# Edit some files +git add <file> +git commit -m "Start a feature" +# Edit some files +git add <file> +git commit -m "Finish a feature" +``` +2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version… +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) 4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: - - Location of page on lektor staging, e.g https://lektor-staging.torproject.org/community/staging/ - - Contents file, on your branch, containing your changes, e.g https://dip.torproject.org/pili/community/blob/master/content/onion-service… - - For the review workflow, please see -5. Once the work has been reviewed and any necessary changes have been made, reviewer should move the issue to the `reviewed` column and add a comment to the issue with details of where the latest version can be found, e.g https://dip.torproject.org/{user}/community/blob/master/content/onion-servi… -6. Team members with write access to gitweb master will then push these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… -7. Merger should then move the the ticket to the `Closed` column + - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/community/develop/ + - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr` + - For the review workflow, please see (Reviewer Workflow) +5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… +6. Merger should then move the the ticket to the `Closed` column + +### Reviewer Workflow + +1. Review the page on lektor-staging +2. Review the content on your repo's develop branch and use the gitlab edit button to make any changes. +3. When you are happy with your changes: + - Update the "Commit message" to explain why you have made your changes + - Update the "Target Branch" + - Make sure that the "Start a new merge request with these changes" checkbox is checked. + - Click on "Commit changes" +4. You will be sent to a new page to create your merge request: + - Update "Title" with a short title to explain your changes + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/community/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged + - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. + - Click "Submit merge request" +5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/community/merge_requests/2` ### Volunteer Workflow @@ -86,12 +111,12 @@ This is the workflow that external volunteers should use when making changes on We recommend that you use our [github mirror](https://github.com/torproject/community) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: 0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before -1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for reviewx +1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for review At this point, one of us on the website team will aim to review your PR within 24h during the week (this may take longer on the weekends). Review will involve: - Reading the text to make sure it's accurate and there are no spelling errors or grammar mistakes - - If there are any front end and/or template changes involved, the changes will be pushed to our development branch for functionality review + - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review - If there are any fixes necessary, we will ask for changes to be made. Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master.

1 0

[community/develop] Replace old Debian docs link to Support portal
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 950fc0ac71010946e2106a242b2ecb2ec3c1a21b Author: gus <gus(a)torproject.org> Date: Fri Sep 27 13:24:57 2019 -0400 Replace old Debian docs link to Support portal --- content/relay-operations/technical-setup/guard/debianubuntu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr index 23b009a..851d399 100644 --- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr +++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr @@ -12,7 +12,7 @@ One of the most imported things to keeps your relay secure is to install securit # 2. Configure Tor Package Repository -Enable the Torproject package repository by following the instructions **[here](https://2019.www.torproject.org/docs/debian.html.en#ubuntu)**. +Enable the Torproject package repository by following the instructions **[here](https://support.torproject.org/apt/tor-deb-repo/)**. # 3. Package Installation

1 0

[community/develop] README.md small style fixes
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 558fa7e9a53cb1a53570b18c51cdeb6d0ce7e632 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Sep 20 12:36:34 2019 +0200 README.md small style fixes --- README.md | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1bc2893..f196cd5 100644 --- a/README.md +++ b/README.md @@ -68,17 +68,7 @@ If you want to contribute to the Community portal, we will be happy to help you. This is the workflow that Tor Internal people should use when making changes on the Community Portal: -1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. e.g -``` -# Start a new feature -git checkout -b new-feature master -# Edit some files -git add <file> -git commit -m "Start a feature" -# Edit some files -git add <file> -git commit -m "Finish a feature" -``` +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. 2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version… 3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) 4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: @@ -86,7 +76,7 @@ git commit -m "Finish a feature" - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr` - For the review workflow, please see (Reviewer Workflow) 5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… -6. Merger should then move the the ticket to the `Closed` column +6. Merger should then move the the ticket to the `Closed` column. ### Reviewer Workflow

1 0

[community/develop] Use menu databags from lego
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 741a2a4a607706b9d8f81f97d0c61469a9e00a52 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:33:38 2019 +0200 Use menu databags from lego --- databags/menu+bn-BD.ini | 1 + databags/menu+de.ini | 20 +------------------- databags/menu+en.ini | 24 +----------------------- databags/menu+es.ini | 2 +- databags/menu+fr.ini | 2 +- databags/menu+id.ini | 1 + databags/menu+is.ini | 1 + databags/menu+it.ini | 2 +- databags/menu+ka.ini | 1 + databags/menu+ko.ini | 1 + databags/menu+pt-BR.ini | 2 +- databags/menu+ru.ini | 2 +- databags/menu+tr.ini | 1 + databags/menu+zh-CN.ini | 1 + databags/menu_footer+bn-BD.ini | 1 + databags/menu_footer+de.ini | 2 +- databags/menu_footer+en.ini | 16 +--------------- databags/menu_footer+es.ini | 2 +- databags/menu_footer+fr.ini | 2 +- databags/menu_footer+id.ini | 1 + databags/menu_footer+is.ini | 1 + databags/menu_footer+it.ini | 2 +- databags/menu_footer+ka.ini | 1 + databags/menu_footer+ko.ini | 1 + databags/menu_footer+pt-BR.ini | 2 +- databags/menu_footer+ru.ini | 2 +- databags/menu_footer+tr.ini | 1 + databags/menu_footer+zh-CN.ini | 1 + lego | 2 +- 29 files changed, 29 insertions(+), 69 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini new file mode 120000 index 0000000..c9b2dc8 --- /dev/null +++ b/databags/menu+bn-BD.ini @@ -0,0 +1 @@ +../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 100644 index 1bd9e8a..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = https://www.torproject.org/de/about/history -label = About - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/de/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/de -label = Donate diff --git a/databags/menu+de.ini b/databags/menu+de.ini new file mode 120000 index 0000000..6bb02de --- /dev/null +++ b/databags/menu+de.ini @@ -0,0 +1 @@ +../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 100644 index cce7df9..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1,23 +0,0 @@ -[about] -path = https://www.torproject.org/about/history -label = About - -[community] -path = https://community.torproject.org/ -label = Community - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org -label = Donate diff --git a/databags/menu+en.ini b/databags/menu+en.ini new file mode 120000 index 0000000..1fa7edf --- /dev/null +++ b/databags/menu+en.ini @@ -0,0 +1 @@ +../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 23a525b..fd8def3 120000 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 23a525b..5366289 120000 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini new file mode 120000 index 0000000..7c2858b --- /dev/null +++ b/databags/menu+id.ini @@ -0,0 +1 @@ +../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini new file mode 120000 index 0000000..b02aed7 --- /dev/null +++ b/databags/menu+is.ini @@ -0,0 +1 @@ +../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini index 23a525b..fcdde73 120000 --- a/databags/menu+it.ini +++ b/databags/menu+it.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini new file mode 120000 index 0000000..336d4ad --- /dev/null +++ b/databags/menu+ka.ini @@ -0,0 +1 @@ +../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini new file mode 120000 index 0000000..31e262b --- /dev/null +++ b/databags/menu+ko.ini @@ -0,0 +1 @@ +../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini index 23a525b..fd27afb 120000 --- a/databags/menu+pt-BR.ini +++ b/databags/menu+pt-BR.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini index 23a525b..6f30a3e 120000 --- a/databags/menu+ru.ini +++ b/databags/menu+ru.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini new file mode 120000 index 0000000..8a01592 --- /dev/null +++ b/databags/menu+tr.ini @@ -0,0 +1 @@ +../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini new file mode 120000 index 0000000..425a6f8 --- /dev/null +++ b/databags/menu+zh-CN.ini @@ -0,0 +1 @@ +../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini new file mode 120000 index 0000000..5dd8aed --- /dev/null +++ b/databags/menu_footer+bn-BD.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini index a3178a1..851da53 120000 --- a/databags/menu_footer+de.ini +++ b/databags/menu_footer+de.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 100644 index b97b531..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = https://www.torproject.org/about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = https://www.torproject.org/contact -label = Contact - -[press] -path = https://www.torproject.org/press -label = Press diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+en.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini index a3178a1..c52cdcb 120000 --- a/databags/menu_footer+es.ini +++ b/databags/menu_footer+es.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini index a3178a1..7ce02c3 120000 --- a/databags/menu_footer+fr.ini +++ b/databags/menu_footer+fr.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini new file mode 120000 index 0000000..056defd --- /dev/null +++ b/databags/menu_footer+id.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini new file mode 120000 index 0000000..2474621 --- /dev/null +++ b/databags/menu_footer+is.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini index a3178a1..8225a53 120000 --- a/databags/menu_footer+it.ini +++ b/databags/menu_footer+it.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini new file mode 120000 index 0000000..fd41467 --- /dev/null +++ b/databags/menu_footer+ka.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini new file mode 120000 index 0000000..6ff3bf2 --- /dev/null +++ b/databags/menu_footer+ko.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini index a3178a1..5198e0f 120000 --- a/databags/menu_footer+pt-BR.ini +++ b/databags/menu_footer+pt-BR.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini index a3178a1..ad782bc 120000 --- a/databags/menu_footer+ru.ini +++ b/databags/menu_footer+ru.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini new file mode 120000 index 0000000..2c88858 --- /dev/null +++ b/databags/menu_footer+tr.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini new file mode 120000 index 0000000..0fd8366 --- /dev/null +++ b/databags/menu_footer+zh-CN.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/lego b/lego index 9c33e2b..aa31aec 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 9c33e2b8740728dc9de4c64915460b76fc7c4061 +Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17

1 0

[community/develop] better strings for l10n
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 176c87e00c097a951d65d60a29c43c9b7e28fb38 Author: emma peel <emma.peel(a)riseup.net> Date: Sun Aug 25 16:39:09 2019 +0200 better strings for l10n --- .../bridge/debian-ubuntu/contents.lr | 31 +++++++++++----------- 1 file changed, 15 insertions(+), 16 deletions(-) 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 cf83c8d..e68a4da 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -12,11 +12,12 @@ Get the latest version of Tor. If you're on Debian stable, `sudo apt-get install ### 2. Install obfs4proxy -On [Debian](https://packages.debian.org/search?keywords=obfs4proxy), the `obfs4proxy` package is available in unstable, testing, and stable. On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic, cosmic, disco, and eoan have the package. If you're running any of them, `sudo apt-get install obfs4proxy` should work. +On [Debian](https://packages.debian.org/search?keywords=obfs4proxy), the `obfs4proxy` package is available in unstable, testing, and stable. +On [Ubuntu](https://packages.ubuntu.com/search?keywords=obfs4proxy), bionic, cosmic, disco, and eoan have the package. +If you're running any of them, `sudo apt-get install obfs4proxy` should work. If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installation). - ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` @@ -30,41 +31,39 @@ ORPort TODO ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be -# externally reachable. Avoid port 9001 because it's commonly associated with -# Tor and censors may be scanning the Internet for this port. +# Replace "TODO" with an obfs4 port of your choice. This port must be externally reachable. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ServerTransportListenAddr obfs4 0.0.0.0:TODO # Local communication port between Tor and obfs4. Always set this to "auto". -# "Ext" means "extended", not "external". Don't try to set a specific port -# number, nor listen on 0.0.0.0. +# "Ext" means "extended", not "external". Don't try to set a specific port number, nor listen on 0.0.0.0. ExtORPort auto -# Replace "<address(a)email.com>" with your email address so we can contact you if -# there are problems with your bridge. This is optional but encouraged. +# Replace "<address(a)email.com>" with your email address so we can contact you if there are problems with your bridge. +# This is optional but encouraged. ContactInfo <address(a)email.com> # Pick a nickname that you like for your bridge. This is optional. Nickname PickANickname ``` +Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. - Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. - -* If you decide to use a fixed obfs4 port smaller than 1024 (for example 80 or 443), you will need to give obfs4 `CAP_NET_BIND_SERVICE` capabilities to bind the port with a non-root user: - +* If you decide to use a fixed obfs4 port smaller than 1024 (for example 80 or 443), you will need to give obfs4 `CAP_NET_BIND_SERVICE` capabilities to bind the port with a non-root user: -`sudo setcap cap_net_bind_service=+ep /usr/bin/obfs4proxy` + `sudo setcap cap_net_bind_service=+ep /usr/bin/obfs4proxy` * Under Debian, you will also need to set `NoNewPrivileges=no` in `/lib/systemd/system/tor(a)default.service` and `/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356)) -* Note that both Tor's OR port and its obfs4 port must be reachable. If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. +* Note that both Tor's OR port and its obfs4 port must be reachable. + If your bridge is behind a firewall or NAT, make sure to open both ports. + You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. ### 4. Restart tor `systemctl restart tor` -### 5. Monitor your logs +### 5. Monitor your logs To confirm your bridge is running with no issues, you should see something like this (usually in `/var/log/tor/log` or `/var/log/syslog`):

1 0

[community/develop] add edit button to two colum pages
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit b80d15bb8b410df5f3d6e3437afcdb71aaa1c52d Author: emma peel <emma.peel(a)riseup.net> Date: Thu Aug 22 16:42:27 2019 +0200 add edit button to two colum pages --- templates/two-columns-page.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 0bd9569..4ccb30e 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -14,6 +14,13 @@ </div> {% endfor %} </div> - <a href="{{ this.parent|url }}">Back to {{ this.parent.title }}</a> + <div class="card mt-5"> + <ul class="list-group list-group-flush"> +  + <li class="list-group-item"> + <a href="{{ this.parent|url }}">{{ _("Back to previous page: ") }}{{ this.parent.title }}</a> - <a href="https://github.com/torproject/community/edit/master/content{{ this.path }}/contents.lr">{{ _("Edit this page") }}</a> + </li> + </ul> + </div> </div> </div> \ No newline at end of file

1 0

[community/develop] Remove 'RunAsDaemon 1'.
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 404d5cac9673b6b363414680521d1381aeb1944d Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Aug 26 17:10:51 2019 -0700 Remove 'RunAsDaemon 1'. This is already set by default. Thanks to Roger for pointing this out. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 1 - .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 1 - content/relay-operations/technical-setup/bridge/freebsd/contents.lr | 1 - content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 1 - 4 files changed, 4 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 14d6e04..f142d56 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 @@ -43,7 +43,6 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally 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 e68a4da..16037a4 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -21,7 +21,6 @@ If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installa ### 3. Edit your Tor config file, usually located at `/etc/tor/torrc` and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 2ec5c8e..78373df 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -17,7 +17,6 @@ pkg install obfs4proxy-tor tor ca_root_nss ### 2. Edit your Tor config file, usually located at `/usr/local/etc/tor` and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index bf7d98a..0a02f9e 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -18,7 +18,6 @@ pkg_add tor obfs4proxy Usually located at `/etc/tor/torrc`, and replace its content with: ``` -RunAsDaemon 1 BridgeRelay 1 # Replace "TODO" with a Tor port of your choice. This port must be externally

1 0