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

[community/staging] Updates relay operation setup for Fedora/CentOS/RHEL
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit cadd8a068feef9b51a99318d81b07c26bbdb7093 Author: Kushal Das <mail(a)kushaldas.in> Date: Tue Apr 14 20:38:23 2020 +0530 Updates relay operation setup for Fedora/CentOS/RHEL It has details on how to install the Tor package from the rpm.torproject.org repository. Based on https://support.torproject.org/rpm/ --- .../bridge/centos-rhel-opensuse/contents.lr | 18 +++++++++++++++++- .../technical-setup/bridge/fedora/contents.lr | 13 +++++++++++++ .../technical-setup/guard/centosrhel/contents.lr | 12 +++++++++++- .../technical-setup/guard/fedora/contents.lr | 12 ++++++++++-- 4 files changed, 51 insertions(+), 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 949ab1a..c19f029 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 @@ -11,7 +11,23 @@ body: * CentOS / RHEL: ``` -yum install epel-release +yum install epel-release -y +``` + +Then add the following to the `/etc/yum.repos.d/tor.repo` file. + +``` +[tor] +name=Tor for Enterprise Linux $releasever - $basearch +baseurl=https://rpm.torproject.org/centos/$releasever/$basearch +enabled=1 +gpgcheck=1 +gpgkey=https://rpm.torproject.org/centos/public_gpg.key +cost=100 +``` +And then install the following packages. + +``` yum install git golang tor policycoreutils-python-utils ``` diff --git a/content/relay-operations/technical-setup/bridge/fedora/contents.lr b/content/relay-operations/technical-setup/bridge/fedora/contents.lr index d4c2734..51c97fc 100644 --- a/content/relay-operations/technical-setup/bridge/fedora/contents.lr +++ b/content/relay-operations/technical-setup/bridge/fedora/contents.lr @@ -8,6 +8,19 @@ body: ### 1. Install tor and dependencies +Add the following to /etc/yum.repos.d/tor.repo + +``` +[tor] +name=Tor for Fedora $releasever - $basearch +baseurl=https://rpm.torproject.org/fedora/$releasever/$basearch +enabled=1 +gpgcheck=1 +gpgkey=https://rpm.torproject.org/fedora/public_gpg.key +cost=100 +``` +Then install tor and the dependencies. + ``` dnf install git golang tor policycoreutils-python-utils ``` diff --git a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr index 696e8af..fa80c75 100644 --- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr +++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr @@ -16,7 +16,17 @@ To install `tor` package on CentOS/RHEL, you need to install the [EPEL](https:// `yum install epel-release` -# 3. Install the tor package and verify the EPEL signing key +# 3. Add the following to /etc/yum.repos.d/tor.repo and then install the tor package. + +``` +[tor] +name=Tor for Enterprise Linux $releasever - $basearch +baseurl=https://rpm.torproject.org/centos/$releasever/$basearch +enabled=1 +gpgcheck=1 +gpgkey=https://rpm.torproject.org/centos/public_gpg.key +cost=100 +``` `yum install tor` diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr b/content/relay-operations/technical-setup/guard/fedora/contents.lr index 97bdd85..0500e55 100644 --- a/content/relay-operations/technical-setup/guard/fedora/contents.lr +++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr @@ -10,9 +10,17 @@ body: One of the most imported things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. Follow the instructions to enable [automatic software updates](updates) for your operating system. -# 2. Install the tor package +# 2. # 3. Add the following to /etc/yum.repos.d/tor.repo and then install the tor package. -`dnf install tor` +``` +[tor] +name=Tor for Fedora $releasever - $basearch +baseurl=https://rpm.torproject.org/fedora/$releasever/$basearch +enabled=1 +gpgcheck=1 +gpgkey=https://rpm.torproject.org/fedora/public_gpg.key +cost=100 +``` # 3. Put the tor configuration file `/etc/tor/torrc` in place

1 0

[community/staging] Add printable outreach materials
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 9e56edf34c5bd1d0ef859409037bf92c549af3ce Merge: b2ca078 14bbc3b Author: Pili Guerra <pili(a)piliguerra.com> Date: Mon Apr 13 17:33:43 2020 +0100 Add printable outreach materials Closes #28 content/outreach/kit/contents.lr | 2 +- databags/outreach-materials.ini | 54 +++++++++++++++++++++++++++++++++++++++ templates/outreach-materials.html | 36 ++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-)

1 0

[community/staging] Remove open-iconic-bootstrap.css link
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 2399b7d586200ea9063c162caafb185b6d968c76 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Sun Apr 12 17:38:07 2020 +0000 Remove open-iconic-bootstrap.css link --- templates/meta.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index bcda0da..9a4c64a 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,6 +2,5 @@ <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"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[community/staging] Create page to list relay-associations. Will fix #63
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 8be6e8d76b1f4a6717053e682523db5464d08efc Author: Pili Guerra <pili(a)piliguerra.com> Date: Wed Mar 25 19:00:27 2020 +0000 Create page to list relay-associations. Will fix #63 --- .../relay-associations/contents.lr | 19 +++ databags/relay-associations.ini | 149 +++++++++++++++++++++ templates/relay-associations.html | 35 +++++ 3 files changed, 203 insertions(+) diff --git a/content/relay-operations/community-resources/relay-associations/contents.lr b/content/relay-operations/community-resources/relay-associations/contents.lr new file mode 100644 index 0000000..28cc246 --- /dev/null +++ b/content/relay-operations/community-resources/relay-associations/contents.lr @@ -0,0 +1,19 @@ +_model: page +--- +color: primary +--- +title: Relay Associations +--- +html: relay-associations.html +--- +key: 6 +--- +section: Community Resources +--- +section_id: community-resources +--- +subtitle: Here is a list of currently active relay associations. +--- +body: + +Please let us know if you would like your relay association to be listed on this page. \ No newline at end of file diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini new file mode 100644 index 0000000..3979727 --- /dev/null +++ b/databags/relay-associations.ini @@ -0,0 +1,149 @@ +[zwiebelfreunde] +link = +image = +label = Zwiebelfreunde e.V. +country = Germany +contact = +active = True +display = True +donate = + +[nosoignons] +link = https://nos-oignons.net/ +image = +label = Nos-oignons +country = France +contact = contact at nos-oignons.net +active = True +display = +donate = + +[enn] +link = https://enn.lu/ +image = +label = Frënn vun der Ënn A.S.B.L. +country = Luxembourg +contact = info(a)enn.lu +active = True +display = +donate = + +[hartvoorinternetvrijheid] +link = https://www.hartvoorinternetvrijheid.nl/ +image = +label = Hart voor Internetvrijheid +country = Netherlands +contact = bestuur(a)hartvoorinternetvrijheid.nl +active = True +display = +donate = + +[saveyourprivacy] +link = https://saveyourprivacy.net +image = +label = SaveYourPrivacy e.V. +country = Germany +contact = info(a)saveyourprivacy.net +active = True +display = +donate = + +[coldhak] +link = https://coldhak.ca/relays/ +image = +label = Coldhak +country = Canada +contact = https://coldhak.ca/about/ +active = True +display = +donate = + +[appliedprivacy] +link = https://appliedprivacy.net/ +image = +label = Foundation for Applied Privacy +country = Austria +contact = tor(a)appliedprivacy.net +active = True +display = +donate = + +[dfri] +link = https://www.dfri.se/ +image = +label = Föreningen för Digitala Fri- och Rättigheter +country = Sweden +contact = dfri(a)dfri.se +active = True +display = +donate = + +[calyxinstitute] +link = https://www.calyxinstitute.org +image = +label = The Calyx Institute +country = US +contact = nick(a)calyx.com +active = True +display = +donate = + +[noisetor] +link = https://noisetor.net +image = +label = NoiseTor +country = US +contact = +active = +display = +donate = + +[icetor] +link = https://icetor.is/ +image = +label = Icetor +country = Iceland +contact = admin <AT> icetor <dot> is +active = +display = +donate = + +[privacyfoundation] +link = https://www.privacyfoundation.ch/ +image = +label = Swiss Privacy Foundation +country = Switzerland +contact = office(a)privacyfoundation.ch +active = +display = +donate = + +[digitalcourage] +link = https://digitalcourage.de/support/tor +image = +label = Digital Courage +country = Germany +contact = +active = True +display = +donate = + +[accessnow] +link = https://accessnow.net +image = +label = Access Now +country = US +contact = +active = True +display = +donate = + +[brasshorncommunications] +link = https://brasshorncommunications.uk/projects/tor/ +image = +label = BrassHorn Communications +country = UK +contact = hello(a)brasshorncommunications.uk +active = True +display = +donate = \ No newline at end of file diff --git a/templates/relay-associations.html b/templates/relay-associations.html new file mode 100644 index 0000000..10448d8 --- /dev/null +++ b/templates/relay-associations.html @@ -0,0 +1,35 @@ +<div class="row pt-5"> + {% include 'sidenav.html' %} + <div class="col-sm-12 col-xs-12 ml-sm-auto col-md-9 col-lg-9 {{ bag('alternatives', this.alt, 'order') }}"> + {{ this.body }} + <div class="container py-3"> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th scope="col">Organization Name</th> + <th scope="col">Country</th> + </tr> + </thead> + <tbody> + {% for id, item in bag('relay-associations').items() %} + {% if item.active == 'True' %} + <tr> + <td> + {% if item.link|length %} + <a href="{{ item.link }}">{{ item.label }}</a> + {% else %} + {{ item.label }} + {% endif %} + </td> + + <td>{{ item.country }}</td> + </tr> + {% endif %} + {% endfor %} + </tbody> + </table> + </div> + </div> + </div> +</div> \ No newline at end of file

1 0

[community/staging] Change the navbar-toggler-icon to the font-awesome icon
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 6441cb452bb7c5083eea614a1caecf3dec837545 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Mon Apr 13 18:04:15 2020 +0000 Change the navbar-toggler-icon to the font-awesome icon --- templates/sidenav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/sidenav.html b/templates/sidenav.html index f0d673b..5175771 100644 --- a/templates/sidenav.html +++ b/templates/sidenav.html @@ -2,7 +2,7 @@ <nav class="smalltopics no-background navbar navbar-expand-lg navbar-light bg-white p-0 fixed"> <label class="side-toggler" for="menu-toggle"> <a class="btn btn-lg outline-primary text-primary navbar-toggler" data-toggle="collapse" data-target="#navbarSupportedTopicsContent" aria-controls="navbarSupportedTopicsContent" aria-expanded="false" aria-label="Toggle navigation"> - <span class="navbar-toggler-icon"></span> + <i class="fas"></i> </a> </label> <input type="checkbox" id="menu-toggle"/>

1 0

[community/staging] Merge branch 'relay-associations'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 82a1952ec4c242ae8de2accb508b3312cea07b3f Merge: cd10fed 8be6e8d Author: gus <gus(a)torproject.org> Date: Wed Apr 22 16:12:10 2020 -0400 Merge branch 'relay-associations' .../relay-associations/contents.lr | 19 +++ databags/relay-associations.ini | 149 +++++++++++++++++++++ templates/relay-associations.html | 35 +++++ 3 files changed, 203 insertions(+)

1 0

[community/staging] Add new training material about the tor network
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 4000c9bbaf65a9b24b2f104684cb04ac4fabc5f0 Author: gus <gus(a)torproject.org> Date: Wed May 13 17:05:52 2020 -0400 Add new training material about the tor network --- databags/training-resources.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/databags/training-resources.json b/databags/training-resources.json index 07591d0..f1e8b10 100644 --- a/databags/training-resources.json +++ b/databags/training-resources.json @@ -17,5 +17,15 @@ "formats" : ["odp"], "description" : "Un conjunto completo de diapositivas para los entrenamientos de Tor", "date" : "2019" + }, + + "tor network" : + { + "label" : "The Tor network", + "name" : "tor-network", + "filename" : "tor-network", + "formats" : ["odp","pdf"], + "description" : "Learn about the Tor network and how to run a relay", + "date" : "2019" } }

1 0

[community/staging] makes outreach/talk nice to read
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit e571f5ba8ce6f42457806d814dbbc3913fd3c6aa Author: Antonela <hola(a)antonela.me> Date: Wed May 13 10:31:14 2020 -0300 makes outreach/talk nice to read --- content/outreach/talk/contents.lr | 30 +-------------- templates/outreach-talk.html | 81 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 29 deletions(-) diff --git a/content/outreach/talk/contents.lr b/content/outreach/talk/contents.lr index 496a54e..f7c6e94 100644 --- a/content/outreach/talk/contents.lr +++ b/content/outreach/talk/contents.lr @@ -12,34 +12,6 @@ subtitle: Here you'll find materials on basic Tor explainers and concepts, ideas --- key: 3 --- -html: two-columns-page.html +html: outreach-talk.html --- body: - -Word of mouth is critical to reaching new people and helping them protect themselves online. Here's how you can help. - -## Explain how - -### Privacy and freedom are human rights. - -These rights are denied online around the world, but Tor gives them back. - -### Tracking and surveillance are widespread. - -We think privacy should be the default online, and that's what our software provides. - -### Privacy isn't about having something to hide. - -Privacy is about protecting who we are as human beings: our fears, our relationships, and our vulnerabilities. - -### People shouldn't be exploited for using the internet. - -Trackers are harvesting our every move, but a safer internet is possible. - -### Tor software is developed by the Tor Project, a 501(c)3 nonprofit organization. - -We build free and open source software anyone can use. - -### Tor software is used by millions of people around the world. - -Journalists, activists, and everyday internet users rely on Tor. diff --git a/templates/outreach-talk.html b/templates/outreach-talk.html new file mode 100644 index 0000000..72443f8 --- /dev/null +++ b/templates/outreach-talk.html @@ -0,0 +1,81 @@ +<div class="row"> + <div class="container"> + <h3 class="py-5">{{ _('Word of mouth is critical to reaching new people and helping them protect themselves online. Here\'s how you can help: ') }}</h3> + <div class="row"> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-users pb-4"></i> + </span> + <h2 class="card-title ">{{ _('Privacy and freedom are human rights.') }}</h2> + <p class="card-text">{{ _('These rights are denied online around the world, but Tor gives them back.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-cookie-bite pb-4"></i> + </span> + <h2 class="card-title">{{ _('Tracking and surveillance are widespread.') }}</h2> + <p class="card-text">{{ _('We think privacy should be the default online, and that\'s what our software provides.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-person-booth pb-4"></i> + </span> + <h2 class="card-title">{{ _('Privacy isn\'t about having something to hide.') }}</h2> + <p class="card-text">{{ _('Privacy is about protecting who we are as human beings: our fears, our relationships, and our vulnerabilities.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-eye-slash pb-4"></i> + </span> + <h2 class="card-title">{{ _('People shouldn\'t be exploited for using the internet.') }}</h2> + <p class="card-text">{{ _('Trackers are harvesting our every move, but a safer internet is possible.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-hand-holding-heart pb-4"></i> + </span> + <h2 class="card-title">{{ _('Tor software is developed by the Tor Project, a 501(c)3 nonprofit organization.') }}</h2> + <p class="card-text">{{ _('We build free and open source software anyone can use.') }}</p> + </div> + </div> + </div> + <div class="col-md-6 col-sm-12 col-xl-4 py-4"> + <div class="card h-100 p-2"> + <div class="card-body"> + <span class="display-4 text-primary"> + <i class="fas fa-globe-africa pb-4"></i> + </span> + <h2 class="card-title">{{ _('Tor software is used by millions of people around the world.') }}</h2> + <p class="card-text">{{ _('Journalists, activists, and everyday internet users rely on Tor.') }}</p> + </div> + </div> + </div> + </div> + + <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>

1 0

[community/staging] Display Noisetor in relay association page
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 23f815697672aef873c7c3355d99563e22f53b39 Author: gus <gus(a)torproject.org> Date: Wed May 13 11:08:31 2020 -0400 Display Noisetor in relay association page --- databags/relay-associations.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini index 3979727..cb7f197 100644 --- a/databags/relay-associations.ini +++ b/databags/relay-associations.ini @@ -94,7 +94,7 @@ image = label = NoiseTor country = US contact = -active = +active = True display = donate = @@ -146,4 +146,4 @@ country = UK contact = hello(a)brasshorncommunications.uk active = True display = -donate = \ No newline at end of file +donate =

1 0

[community/staging] Remove outdated and redundant paragraphs.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 3f4665b232c82d718fdee019fbb651d0fc8dff50 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed May 13 08:51:46 2020 -0700 Remove outdated and redundant paragraphs. --- .../technical-setup/bridge/docker/contents.lr | 30 +++++----------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 48208ca..7c964f8 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -6,18 +6,9 @@ title: Docker --- body: -### 1. Pull the image +### 1. Deploy a container -We are maintaining a docker image that runs an obfs4 bridge. -First, download the image: - -``` -docker pull phwinter/obfs4-bridge:latest -``` - -### 2. Deploy a container - -We provide a docker-compose.yml file that helps you deploy the 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 @@ -36,7 +27,8 @@ EMAIL=Z Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that **both** ports are forwarded in your firewall), and `Z` with your email address, which allows us to get in touch with you if there are problems with your bridge. -With your bridge configuration in place, you can now deploy the container: +With your bridge configuration in place, you can now deploy the container by +running: ``` docker-compose up -d obfs4-bridge @@ -53,17 +45,7 @@ Starting docker-obfs4-bridge_obfs4-bridge_1 ... done That's it! Your container is now bootstrapping your new obfs4 bridge. -If you want to run multiple bridges on your machine, you need to create more -bridge configuration files with different sets of ports, and run `make deploy` -again, like so: - -``` -source bridge-1.sh && make deploy -source bridge-2.sh && make deploy -... -``` - -### 3. Upgrade your container +### 2. Upgrade your container Upgrading to the latest version of our image is as simple as running: @@ -75,7 +57,7 @@ Note that your bridge's data directory (which includes its key material) is stor If you are running multiple bridges on your computer, you need to repeat this step for each bridge. We will announce new image versions on the [tor-dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing list. -### 4. Monitor your logs +### 3. Monitor your logs You can inspect your bridge's logs by running:

1 0