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

[community/develop] Make instructions non-redundant
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit d79e0a6cb2028678c2bc8661cb357c0156a71949 Author: Christopher King <bunnyapocalypse(a)protonmail.com> Date: Wed Sep 4 18:06:17 2019 +0000 Make instructions non-redundant --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 9 ++++----- 1 file changed, 4 insertions(+), 5 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 0f11215..04b7b77 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 @@ -82,18 +82,17 @@ Nickname PickANickname ### 4. Restart tor -* CentOS / RHEL / OpenSUSE: - -`systemctl restart tor` - * RHEL / CentOS: ``` sudo semanage port -a -t tor_port_t -p tcp [desired ORPort number set earlier] sudo semanage port -a -t tor_port_t -p tcp [desired ServerTransportListenAddr port number set earlier] -systemctl restart tor ``` +* CentOS / RHEL / OpenSUSE: + +`systemctl restart tor` + ### 5. Monitor your logs (usually in your syslog) To confirm your bridge is running with no issues, you should see something like this:

1 0

[community/develop] Swap order for consistency.
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 06104d9101f072d7185788dd6dcd70f77b06d75a Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 4 12:05:31 2019 -0700 Swap order for consistency. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 04b7b77..13b3119 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 @@ -82,7 +82,7 @@ Nickname PickANickname ### 4. Restart tor -* RHEL / CentOS: +* CentOS / RHEL: ``` sudo semanage port -a -t tor_port_t -p tcp [desired ORPort number set earlier]

1 0

[community/develop] Make comment consistent with Fedora instructions.
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 012c2febcf2e9dc411c09fba988bba185c6d699d Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 4 12:06:43 2019 -0700 Make comment consistent with Fedora instructions. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 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 13b3119..949ab1a 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 @@ -85,8 +85,8 @@ Nickname PickANickname * CentOS / RHEL: ``` -sudo semanage port -a -t tor_port_t -p tcp [desired ORPort number set earlier] -sudo semanage port -a -t tor_port_t -p tcp [desired ServerTransportListenAddr port number set earlier] +sudo semanage port -a -t tor_port_t -p tcp [OR port set earlier, in TODO1] +sudo semanage port -a -t tor_port_t -p tcp [obfs4 port set earlier, in TODO2] ``` * CentOS / RHEL / OpenSUSE:

1 0

[community/develop] Add code of conduct from remote repository
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit cdc64b4322e1a97f594f318fb4b34f3599bbc611 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 15:59:17 2019 +0200 Add code of conduct from remote repository --- content/training/code-of-conduct/contents.lr | 2 +- templates/two-columns-page.html | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/content/training/code-of-conduct/contents.lr b/content/training/code-of-conduct/contents.lr index 0f3eab0..6d39f0d 100644 --- a/content/training/code-of-conduct/contents.lr +++ b/content/training/code-of-conduct/contents.lr @@ -20,6 +20,6 @@ html: two-columns-page.html --- body: -##Code of Conduct for Trainers +## Code of Conduct for Trainers The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate. You can find our code of conduct [here](https://gitweb.torproject.org/community/policies.git/tree/code_of_con… diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 4ccb30e..199a452 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -14,6 +14,11 @@ </div> {% endfor %} </div> + + {% if this.path == "/training/code-of-conduct" %} + {{ render_text("https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.…")|safe }} + {% endif %} + <div class="card mt-5"> <ul class="list-group list-group-flush">  @@ -23,4 +28,4 @@ </ul> </div> </div> -</div> \ No newline at end of file +</div>

1 0

[community/develop] Add .github/FUNDING.yml
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit b02f61915cad2278ecddf5fb308474a7a72ab8f5 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 12 15:40:18 2019 +0200 Add .github/FUNDING.yml --- .github/FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..d56cbc1 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +custom: ['https://donate.torproject.org']

1 0

[community/develop] Update symlinks and add metatag
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 490a08098eb9ee359fba7b3598d81bb067c55b0c Author: hiro <hiro(a)torproject.org> Date: Thu Sep 5 16:40:58 2019 +0200 Update symlinks and add metatag --- assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/js | 2 +- templates/meta.html | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/javascript b/assets/javascript index c8db05e..f1da3c5 120000 --- a/assets/javascript +++ b/assets/javascript @@ -1 +1 @@ -../lego/assests/javascript \ No newline at end of file +../lego/assets/javascript \ No newline at end of file diff --git a/assets/scss b/assets/scss index b77f409..2d8ed2e 120000 --- a/assets/scss +++ b/assets/scss @@ -1 +1 @@ -../lego/assests/scss \ No newline at end of file +../lego/assets/scss \ No newline at end of file diff --git a/assets/static/css b/assets/static/css index 0db4948..12e4567 120000 --- a/assets/static/css +++ b/assets/static/css @@ -1 +1 @@ -../../lego/assests/static/css \ No newline at end of file +../../lego/assets/static/css \ No newline at end of file diff --git a/assets/static/fonts b/assets/static/fonts index 2da38c7..25deee7 120000 --- a/assets/static/fonts +++ b/assets/static/fonts @@ -1 +1 @@ -../../lego/assests/static/fonts \ No newline at end of file +../../lego/assets/static/fonts \ No newline at end of file diff --git a/assets/static/js b/assets/static/js index 7b741e3..361859a 120000 --- a/assets/static/js +++ b/assets/static/js @@ -1 +1 @@ -../../lego/assests/static/js \ No newline at end of file +../../lego/assets/static/js \ No newline at end of file diff --git a/templates/meta.html b/templates/meta.html index a4ae472..bcda0da 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,5 +1,6 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> +<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/open-iconic/font/css/open-iconic-bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">

1 0

[community/develop] Update trademark FAQ link in footer
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit dc4e02b3d5bfca6a76d431dd8508645c4baeaa5d Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sun Sep 8 07:36:43 2019 +0530 Update trademark FAQ link in footer will-fix https://dip.torproject.org/web/tpo/issues/39 partly --- templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/footer.html b/templates/macros/footer.html index 90b9dfd..e3c90c8 100644 --- a/templates/macros/footer.html +++ b/templates/macros/footer.html @@ -1,3 +1,3 @@ {% macro render_faq() %} - <a href="https://www.torproject.org/docs/trademark-faq" target="_blank" class="text-primary text-light"><u>FAQ</u></a> + <a href="https://www.torproject.org/about/trademark/" target="_blank" class="text-primary text-light"><u>FAQ</u></a> {% endmacro %}

1 0

[community/develop] Remove locales
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 70badd8c52266881c12793b38f8ef3c3bb24b1b3 Author: hiro <hiro(a)torproject.org> Date: Thu Sep 12 22:21:29 2019 +0200 Remove locales --- community.lektorproject | 30 ------------------------------ databags/alternatives.ini | 36 ------------------------------------ 2 files changed, 66 deletions(-) diff --git a/community.lektorproject b/community.lektorproject index 7195f39..e75ff45 100644 --- a/community.lektorproject +++ b/community.lektorproject @@ -9,33 +9,3 @@ name = English (en) primary = yes url_prefix = / locale = en - -[alternatives.de] -name = Deutsch (de) -url_prefix = /de/ -locale = de - -[alternatives.es] -name = Español -url_prefix = /es/ -locale = es - -[alternatives.fr] -name = Français -url_prefix = /fr/ -locale = fr - -[alternatives.it] -name = Italia (it) -url_prefix = /it/ -locale = it - -[alternatives.pt-BR] -name = Português Br. (pr-BR) -url_prefix = /pt-BR/ -locale = pt-BR - -[alternatives.ru] -name = Русский (ru) -url_prefix = /ru/ -locale = ru diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 1dafc16..5ac0263 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -3,39 +3,3 @@ direction = text-left order = order-last url = / language = English (en) - -[de] -direction = text-left -order = order-last -url = /de/ -language = Deutsch (de) - -[es] -direction = text-left -order = order-last -url = /es/ -language = Español (es) - -[fr] -direction = text-left -order = order-last -url = /fr/ -language = Français (fr) - -[it] -direction = text-left -order = order-last -url = /it/ -language = Italiano (it) - -[pt-BR] -direction = text-left -order = order-last -url = /pt-BR/ -language = Português Br. (pt-BR) - -[ru] -direction = text-left -order = order-last -url = /ru/ -language = Русский (ru)

1 0

[community/develop] Find and replace all links to "How to report bugs or feedback"
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 2b4b282641d4c7b8cb02c9b741bbe21bdfca0913 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:24:56 2019 +0530 Find and replace all links to "How to report bugs or feedback" Fixes part of https://dip.torproject.org/web/support/issues/39 --- content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/localization/translation-problem/contents.lr b/content/localization/translation-problem/contents.lr index 6194625..56eb26d 100644 --- a/content/localization/translation-problem/contents.lr +++ b/content/localization/translation-problem/contents.lr @@ -19,6 +19,6 @@ body: ### Reporting an error with a translation * If you are already a [Tor translator](becoming-tor-translator), you can simply find the string and fix it in [transifex](https://www.transifex.com/otf/torproject/). -* If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://trac.torproject.org/projects/tor/wiki/doc/community/How…, under the **Community/Translations** component. +* If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under the **Community/Translations** component. * You can report such issues on [irc](https://webchat.oftc.net/), on the #tor-l10n channel (you may need to be registered to log in). * You can send an email to the [tor localization mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n).

1 0

[community/develop] Fix OpenBSD tor bridge instructions (data dir + logging perms)
by hiro＠torproject.org 18 Sep '19

18 Sep '19

commit 7638d280ffead9a94b9cec92aece2a7cdfc0c5ae Author: Nick Gnazzo <nickgnazzo(a)icloud.com> Date: Thu Sep 12 10:48:39 2019 -0400 Fix OpenBSD tor bridge instructions (data dir + logging perms) --- .../technical-setup/bridge/openbsd/contents.lr | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 50d1a26..55b8f60 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -49,19 +49,27 @@ Nickname PickANickname Log notice file /var/log/tor/notices.log User _tor +DataDirectory /var/tor ``` Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. * 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. -### 3. Start the tor daemon and make sure it starts at boot: +### 3. Create the tor log directory and give it the correct permissions: + +``` +mkdir /var/log/tor +chown _tor /var/log/tor +``` + +### 4. Start the tor daemon and make sure it starts at boot: ``` rcctl enable tor rcctl start tor ``` -### 4. Monitor your logs +### 5. Monitor your logs To confirm your bridge is running with no issues, you should see something like this (`/var/log/tor/notices.log`): @@ -75,7 +83,7 @@ To confirm your bridge is running with no issues, you should see something like [notice] Self-testing indicates your ORPort is reachable from the outside. Excellent. Publishing server descriptor. ``` -### 5. Final notes +### 6. Final notes If you are having troubles setting up your bridge, have a look at [our help section](https://community.torproject.org/relay/getting-help/). If

1 0