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

[community/develop] Harmonise instructions with other guides.
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit e2b8aa6cbebe15f24e38b58ca3f27403b1746f36 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 4 09:44:59 2019 -0700 Harmonise instructions with other guides. In particular: * Use "TODO1" and "TODO2" to make it clear that the OR and the obfs4 port are separate ports. * Slightly rephrase comments for selinux commands. * Fix link to help section. * Fix subtitle. --- .../technical-setup/bridge/fedora/contents.lr | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/fedora/contents.lr b/content/relay-operations/technical-setup/bridge/fedora/contents.lr index 40ad6a9..d4c2734 100644 --- a/content/relay-operations/technical-setup/bridge/fedora/contents.lr +++ b/content/relay-operations/technical-setup/bridge/fedora/contents.lr @@ -30,17 +30,18 @@ And tell selinux to allow Tor to use obfs4proxy: RunAsDaemon 1 BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor 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. -ORPort TODO +ORPort TODO1 ServerTransportPlugin obfs4 exec /usr/local/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 +# Replace "TODO2" with an obfs4 port of your choice. This port must be +# externally reachable and must be different from the one specified for ORPort. +# 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 +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # 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 @@ -62,8 +63,8 @@ Nickname PickANickname ### 4. Restart tor ``` -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] systemctl restart tor ``` @@ -84,7 +85,7 @@ To confirm your bridge is running with no issues, you should see something like ### 6. Final notes If you are having troubles setting up your bridge, have a look at [our help -section](https://community.torproject.org/relay/setup/bridge/getting-help/). If +section](https://community.torproject.org/relay/getting-help/). If your bridge is now running, check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/). @@ -97,7 +98,7 @@ key: --- color: primary --- -subtitle: How to deploy an obfs4 bridge on CentOS / RHEL / OpenSUSE +subtitle: How to deploy an obfs4 bridge on Fedora --- _template: layout.html ---

1 0

[community/develop] Merge branch 'fedora-guide' of github.com:BunnyApocalypse/community into fedora-guide
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit ba29705a7f40bdde753895190d0706333d515ab9 Merge: 31fda16 58c72a4 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 4 09:26:44 2019 -0700 Merge branch 'fedora-guide' of github.com:BunnyApocalypse/community into fedora-guide .../technical-setup/bridge/fedora/contents.lr | 106 +++++++++++++++++++++ 1 file changed, 106 insertions(+)

1 0

[community/develop] Make instructions non-redundant
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 4ebd0280503d5dc64cbe86df5ab9732cc0ebaa9a 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 521ed71..914ca90 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 @@ -81,18 +81,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] Merge branch 'patch-1' of github.com:BunnyApocalypse/community into patch-1
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit beb4f69cf7af71e6f2d74760725ae44681e87c5b Merge: e2b8aa6 4ebd028 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Sep 4 12:01:44 2019 -0700 Merge branch 'patch-1' of github.com:BunnyApocalypse/community into patch-1 .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)

1 0

[community/develop] Swap order for consistency.
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit ded0deb18c6f8e06e0e008578237ab644d799f79 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 emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 59b8c7268ff5c50150ec45832f44798a677e7a0c 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 emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit fb39e68719548fb7a3345a85958e969988152478 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 +- lego | 2 +- templates/two-columns-page.html | 7 ++++++- 3 files changed, 8 insertions(+), 3 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/lego b/lego index 62b25f1..4911d14 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 62b25f1cba4a7af931ccd8f4420d0669812db09c +Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8 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] Update symlinks and add metatag
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 24dc3300438f52ef9659860b956b796598b70555 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 +- lego | 2 +- templates/meta.html | 1 + 7 files changed, 7 insertions(+), 6 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/lego b/lego index 4911d14..3d80025 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 4911d14b482d292742f5f0e30130e4b6817f56f8 +Subproject commit 3d8002591b1a6df64e27624bd08d7a91d8e4c763 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] Ops! Small typo
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 4bffa9619e6e50badc26e9659c59b00649ef724d Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Sep 5 17:30:39 2019 -0400 Ops! Small typo --- .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index 86c1638..241a967 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -1,6 +1,6 @@ _model: page --- -title: BSD* +title: *BSD --- color: primary ---

1 0

[community/develop] Update trademark FAQ link in footer
by emmapeel＠torproject.org 05 Oct '19

05 Oct '19

commit 07d01f82cd4e1b8f5e00611f3de068262282d174 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