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

[community/develop] Bringing onion services section in line with other sections
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit f160b86710d2af6346650c2670939177c9f04299 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Oct 11 11:20:23 2019 +0200 Bringing onion services section in line with other sections --- content/onion-services/ssl-tls/contents.lr | 21 ------------- templates/onion-services.html | 49 ++++++++++++++---------------- 2 files changed, 22 insertions(+), 48 deletions(-) diff --git a/content/onion-services/ssl-tls/contents.lr b/content/onion-services/ssl-tls/contents.lr deleted file mode 100644 index e60a121..0000000 --- a/content/onion-services/ssl-tls/contents.lr +++ /dev/null @@ -1,21 +0,0 @@ -section: onion services ---- -section_id: onion-services ---- -color: primary ---- -image: lock ---- -_template: layout.html ---- -title: Adding SSL/TLS to a .onion site ---- -subtitle: Add more security and authenticity for your .onion. ---- -key: 2 ---- -html: two-columns-page.html ---- -body: - -Coming soon diff --git a/templates/onion-services.html b/templates/onion-services.html index 94e834a..a4a7ed6 100644 --- a/templates/onion-services.html +++ b/templates/onion-services.html @@ -7,43 +7,30 @@ <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> - <a href="{{ this.path|url }}overview/"><h2 class="text-primary"><u>{{ _('Learn more about onion services here') }} - <i class="fas fa-arrow-right"></i></u> - </h2></a> - <div class="row py-5"> + <div class="row"> {% for child in this.children|sort(attribute='key') %} - {% if child.key != '0' %} - <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> - <div class="card h-100 border-0"> + <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> + <div class="card h-100"> <div class="card-body"> - <h2 class="text-primary display-2"><i class="fas fa-{{ child.image }}"></i></h2> - <h4 class="card-title text-primary">{{ child.title }}</h4> - <p class="card-text">{{ child.subtitle }}</p> - <a href="{{ child.path|url }}">{{ child.cta }} <i class="fas fa-arrow-right"></i></a> + <div class="card-body"> + <h4 class="card-title text-primary"> + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + </h4> + <p class="card-text">{{ _(child.subtitle) }}</p> + </div> </div> </div> </div> - {% endif %} {% endfor %} </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Onionize any website') }}</h2> <p class="text-center"> - {{ _('There\'s a toolkit that lets you take any existing website and host it as a .onion site. You would wanna do this because .onion sites are more secure than just regular sites. We show you how to use this toolkit and onionize a site.') }} + {{ _('There\'s a toolkit that lets you take any existing website and host it as a .onion site. You would want do this because .onion sites are more secure than just regular sites. We show you how to use this toolkit and onionize a site.') }} </p> - </div> - <div class="row mx-auto"> - <div class="col-6"> - <a href="https://github.com/alecmuffett/eotk#i-want-to-create-my-own-project"> - <h3 class="text-primary text-center mx-auto"><u>{{ _('Learn more') }} - <i class="fas fa-arrow-right"></i></u> - </h3></a> - </div> - <div class="col-6"> - <a href="https://github.com/alecmuffett/eotk"><h3 class="text-primary text-center mx-auto"><u>{{ _('Check out the code') }} - <i class="fas fa-arrow-right"></i></u> - </h3></a> - </div> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://github.com/alecmuffett/eotk"> + {{ _('Check out the code') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Featured .onion sites') }}</h2> @@ -63,6 +50,14 @@ </div> </div> {% endfor %} - + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Learn More') }}</h2> + <p class="text-center"> + {{ _('Are you interested in learning more about onion services? Join our tor-onions mailing list to speak with other onion service operators.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-onions"> + {{ _('Tor Onions mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> </div> </div>

1 0

[community/develop] review content, add links
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 5b70c18d816bd835fdda8cb069564ca9c588238a Author: Antonela <hola(a)antonela.me> Date: Fri Oct 18 10:57:58 2019 -0300 review content, add links --- content/user-research/guidelines/contents.lr | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index d208e25..a036343 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -2,6 +2,8 @@ section: user research --- section_id: user-research --- +color: primary +--- title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. @@ -17,7 +19,7 @@ body: Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board! In this place, you will find helpful guidelines that are designed to make your research easier for you and your audience. -First of all, make sure you read the [Tor Code of Conduct](https://linktocodeofconduct). +First of all, make sure you read the [Tor Code of Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_…. ## Respect privacy At Tor, we collect only necessary data to improve our services; we don't collect invasive data about user behaviors - we test our software, not people. @@ -40,7 +42,7 @@ Send us the result - you don't have to write a report, we can do this data analy ## Coordinate with the trainer and the Tor UX team -You're not doing all this work alone - we will support you with meetings, guides, and mentorship if you want. You can join us at any time on our IRC channel #tor-ux and our [mailing list](). +You're not doing all this work alone - we will support you with meetings, guides, and mentorship if you want. You can join us at any time on our IRC channel #tor-ux and our [mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/ux). You must be aligned about the agenda and time to run interviews (if that is the case) during the end of the training. **We strongly recommend that you go through the program of the exercise with the trainer**. Also, we want you two to coordinate feedbacks together — both for you and for your audience. @@ -71,5 +73,5 @@ You can find our document to report [here](https://linkto). But if you think you There are plenty of documents online about how to run a User Research, here you can find some of them: * [Design Kit: The Human-Centered Design Toolkit](https://www.ideo.com/post/design-kit) -* [A collection of activities, the Exploratorium facilitates a participatory design and development process](https://okthanks.com/exploratorium) -* [Knowledge Base](https://simplysecure.org/knowledge-base/) +* [Simply Secure Knowledge Base](https://simplysecure.org/knowledge-base/) +* [OK Thanks Exploratorium ](https://okthanks.com/exploratorium)

1 0

[community/develop] quick typo/grammar fix! thanks
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 6874a557c2f9a7120fff099001ff1af46145f2ac Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Fri Oct 18 15:16:42 2019 +0000 quick typo/grammar fix! thanks --- .../relay-operations/technical-setup/bridge/dragonflybsd/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr index 630b347..1e4fdf6 100644 --- a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr @@ -41,7 +41,7 @@ For fresh installations, the file `/usr/local/etc/pkg/repos/df-latest.conf.sampl - Avalon (mirror-master.dragonflybsd.org) - Wolfpond (pkg.wolfpond.org) -We can simply edit the **URL** used to point out the repositories on `/usr/local/etc/pkg/repos/df-latest` and that's it! Remember to use **pkg+https://** for Avalon. +We can simply edit the **URL** used to point to the repositories on `/usr/local/etc/pkg/repos/df-latest` and that's it! Remember to use **pkg+https://** for Avalon. After applying all these changes, we update the packages list again and try to check if there's already a new update to apply:

1 0

[community/develop] consistency for netbsd's bridge setup.
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 3ebeece7321d2b32510f511b86994a2bde1f64ec Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Fri Oct 18 15:21:05 2019 +0000 consistency for netbsd's bridge setup. --- content/relay-operations/technical-setup/bridge/netbsd/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr index 41f7b46..33a42a0 100644 --- a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr @@ -58,7 +58,7 @@ Log notice syslog Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, and `Nickname` options. -* Please note that both `ORPort` and the port you used as `TODO2` (for obfs4) must be reachable. If your bridge is behind a firewall or NAT, make sure to open/forward 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/forward both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. * Are you firewalling your NetBSD? If so, make sure that `obfs4proxy` can talk to `tor` over the loopback interface - do not forget to whitelist the **ExtORPort**.

1 0

[community/develop] update content
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 8b765e8d11300b913673075b5a6305fcef2d3110 Author: Antonela <hola(a)antonela.me> Date: Sat Oct 19 09:59:10 2019 -0300 update content steph's review. Close #103 https://dip.torproject.org/steph/community/blob/develop/content/user-resear… --- content/user-research/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 5787f2c..2ad1aeb 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -8,7 +8,7 @@ _template: layout.html --- title: User Research --- -subtitle: We conduct user research while also respecting user privacy. +subtitle: We respect our users' privacy when we conduct research. --- cta: Learn about Tor users --- @@ -18,6 +18,6 @@ html: user-research.html --- body: -## We conduct user research while also respecting user privacy. +## We respect our users' privacy when we conduct research. -We practice human-centered design on building tools for internet freedom while we build community. Our user research is funded by the premises of consent, respect, and empathy. Make an impact in your local community by listening to our users. Learn how we do it and help Tor with user research. +We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research.

1 0

[community/develop] Update user-research section to include hidden content
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit c7309bc6e56a51d5e648fc7990671b2d589de1e6 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 17:37:44 2019 +0200 Update user-research section to include hidden content --- content/user-research/become-tester/contents.lr | 4 +--- content/user-research/contents.lr | 2 ++ content/user-research/guidelines/contents.lr | 4 +--- content/user-research/open/contents.lr | 4 ++-- lego | 2 +- templates/two-columns-page.html | 2 +- templates/user-research.html | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 7025245..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,8 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -_template: layout.html ---- -html: two-columns-page.html +_hidden: yes --- body: diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 2ad1aeb..e6fb45d 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -21,3 +21,5 @@ body: ## We respect our users' privacy when we conduct research. We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research. +--- +_discoverable: yes diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index a036343..0958fe9 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,12 +8,10 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -hide: yes +_hidden: yes --- key: 3 --- -html: two-columns-page.html ---- body: Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board! diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index c1f5c1a..252fbea 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,9 +12,9 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -key: 2 +_hidden: yes --- -html: two-columns-page.html +key: 2 --- body: These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines). diff --git a/lego b/lego index 09c5813..a2e8d34 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit a2e8d340105281a2b7bbfe422a17f72e402ee1a8 diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 5151905..3c6832b 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -6,7 +6,7 @@ <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in this.children.include_hidden(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> diff --git a/templates/user-research.html b/templates/user-research.html index e12fa62..7d6bd13 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,13 @@ </div> </div> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {{ _(child.title) }} </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[community/develop] revisiting dragonfly's bridge setup; thanks @mpguerra and @NullHypothesis! :)
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 1ee18ecd6f257637b96b4b917d79650440a87384 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Fri Oct 18 15:15:13 2019 +0000 revisiting dragonfly's bridge setup; thanks @mpguerra and @NullHypothesis! :) --- .../technical-setup/bridge/dragonflybsd/contents.lr | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr b/content/relay-operations/technical-setup/bridge/dragonflybsd/contents.lr index 7300d3d..630b347 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: 3 +key: 5 --- body: @@ -50,19 +50,20 @@ pkg update -f pkg upgrade -y -f ``` -### 2. Install `tor` DragonflyBSD's Package +### 2. Install `tor` and `obfs4proxy` DragonflyBSD's Package Here we can choose to install the latest stable version, like: ``` -pkg install tor +pkg install tor obfs4proxy-tor ``` ... or install an alpha release: ``` -pkg install tor-devel +pkg install tor-devel obfs4proxy-tor +``` ### 3. Configure `/usr/local/etc/tor/torrc` to run **Tor** as a Bridge @@ -119,6 +120,10 @@ service tor start To confirm your bridge is running with no issues, you should see something like this in `/var/log/tor/notices.log`: ``` +tail /var/log/tor/notices.log +``` + +``` [notice] Your Tor server's identity key fingerprint is '<NICKNAME> <FINGERPRINT>' [notice] Your Tor bridge's hashed identity key fingerprint is '<NICKNAME> <HASHED FINGERPRINT>' [notice] Registered server transport 'obfs4' at '[::]:46396'

1 0

[community/develop] giving netbsd's bridge setup a new KEY id.
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit d5c38f5e3d4b529bc7c6973fff4f24d42409c058 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Fri Oct 18 15:17:05 2019 +0000 giving netbsd's bridge setup a new KEY id. --- content/relay-operations/technical-setup/bridge/netbsd/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr index 8262eda..41f7b46 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: 3 +key: 6 --- body:

1 0

[community/develop] update content
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 5c8832006c6b2575cbbd17bfc1aa4501f751432e Author: Antonela <hola(a)antonela.me> Date: Fri Oct 18 13:07:30 2019 -0300 update content --- content/user-research/open/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index bfb6a10..c1f5c1a 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -17,7 +17,7 @@ key: 2 html: two-columns-page.html --- body: -These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](#). +These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines). ### Tor Browser for Desktop * [User Research: Onboarding](https://dip.torproject.org/torproject/ux/research/blob/master/s…

1 0

[community/develop] Revert previous commit and fix conflicts
by pili＠torproject.org 18 Nov '19

18 Nov '19

commit 89f7bff151c6fda4611c2b5351f35bbea6052350 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:21:09 2019 +0200 Revert previous commit and fix conflicts --- content/user-research/become-tester/contents.lr | 4 ---- content/user-research/guidelines/contents.lr | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 5dfa354..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -10,8 +10,4 @@ key: 1 --- _hidden: yes --- -_template: layout.html ---- -html: two-columns-page.html ---- body: diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 247654c..66ad447 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,6 +8,7 @@ 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

1 0