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

[training/master] Add english file
by pili＠torproject.org 20 Sep '19

20 Sep '19

commit 45f299f9a3e754c3a8532f182dded15126c086d3 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Sep 20 13:20:51 2019 +0200 Add english file --- 2019/all-about-tor/all-about-tor-full-pack+en.md | 284 +++++++++++++++++++++++ 1 file changed, 284 insertions(+) diff --git a/2019/all-about-tor/all-about-tor-full-pack+en.md b/2019/all-about-tor/all-about-tor-full-pack+en.md new file mode 100644 index 0000000..cbfa3f2 --- /dev/null +++ b/2019/all-about-tor/all-about-tor-full-pack+en.md @@ -0,0 +1,284 @@ +# All About Tor + +Version 2019 - 02 + +# Agenda + + * Fill in this section + * With your agenda for the day + * To help your audience stay focused! + +# Let's begin + + * Do you use Tor? + * If not, why not? + * If yes, do you have any questions, concerns, issues, or doubts about using it? + * Do you teach others about Tor? + +# What is Tor? + + * Free software and an open network + * Mitigates against tracking, surveillance and censorship + * Run by a US non-profit and volunteers from all over the world + * It's Tor, not TOR + +# Why do we need Tor? + + * Government mass and targeted surveillance + * The business model of the Internet: big data, advertising, non-consensual tracking + * Surveillance threats from family, bosses, bad people on the Internet + +# Why do you need Tor? + + * Let’s discuss the work you do + * Adversaries and challenges + * Mitigations + * How Tor can help + +# little-t Tor or core tor + + * Tor the network daemon (a computer program) + * Presents a SOCKS or http proxy + * Location and source anonymity, similar to a VPN or regular proxy (but better!) + * Network of relays in many parts of the world + +# Who can see your activity without Tor or HTTPS? + + +# Who can see your activity with Tor and HTTPS? + +# Tor Browser + + * little-t tor plus patched Firefox + * Anyone snooping can’t see the websites you visit + * Websites can’t track you or see other sites you visit (cross-tracking) + * Prevents other privacy violations like fingerprinting or 3rd party cookies + * Writes nearly nothing to disk + * No browser history + * Cross platform: Windows, macOS, Linux and Android + +# Tor Browser in other languages + + * Go to https://torproject.org + * Select the language on dropdown menu + * Or select “Download in another language or platform” + +# Downloading Tor Browser + + * The safest way to download is from https://torproject.org + + * If https://torproject.org is blocked, try mirrors + * http://tor.calyxinstitute.org/ + * https://tor.eff.org/ + + * Or try GetTor - email gettor(a)torproject.org and in the message write “windows”, “osx” or “linux” (no quotes, no subject line) + +# Running Tor Browser the first time + +# Using Tor Browser + + * Default search engine: DuckDuckGo + * Bundled with NoScript, HTTPS Everywhere + * You should not add any other extensions nor enable any plugins (eg Flash)! + * Best practices: + Websites won’t know anything about you unless you login and tell them + +# Clicking on the site information menu will show your current circuit (and “New Circuit for this site” option) + +# Updating Tor Browser + +# Uninstalling Tor Browser + +Uninstalling Tor Browser is as easy as moving the folder to the trash! Then, empty the trash. + +Default Tor Browser folder locations: + + * Windows: desktop + * macOS: move the Tor Browser application to Trash and also the TorBrowser-Data folder (~/Library/Application Support/) + * Linux: home, or look for a name like “tor-browser_en-US” + +# Troubleshooting Tor Browser + + * Is your system clock correct? + * Is the browser already running? + * Are you being censored? + * Is your antivirus or firewall blocking Tor? + * Do you have a very old operating system? + * Try uninstalling and reinstalling + * Get help at https://support.torproject.org + +# More Tor Browser + +# The “onion” menu + + * New Identity: completely refreshes Tor Browser and its circuits; wipes all history; closes all tabs + * Tor network settings: censorship mitigation options; access to Tor log + * Check for Tor Browser update + +# Security Slider + +# NoScript + + * It’s not advisable to change settings in the “options” menu + * For example, adding sites to the “whitelist” can result in fingerprinting + * Instead, only “temporarily trust” blocked objects + +# DuckDuckGo + + * DuckDuckGo is the default search engine in Tor Browser + * Using Tor Browser prevents DDG from tracking users, even if they wanted to (they claim not to) + * Duckduckgo.com or https://3g2upl4pq6kufc4m.onion/ + +# Plugins, add-ons, Javascript + + * Do not add any new add-ons/extensions to Tor, and don’t enable any plugins + * For example, Flash plugin can reveal your real location + * Javascript is enabled by default, but is sanitized to preserve anonymity + * To prevent possible Javascript vulnerabilities, use the “safest” setting in the security slider + +# Mobile Tor + +# Things to know about mobile Tor + + * The design of mobile devices makes full privacy impossible + * Mobile Tor is best for censorship prevention + * Can also provide better privacy for some threat models + * We’re making it better all the time and better options for mobile devices are coming out soon + +# Tor Browser for Android + + * You don’t need to install two APPs (Orbot and Orfox) anymore + * Find it in the Play Store + * Or Guardian Project repository in F-Droid + * Or download .apk + +# Onion Browser + + * Tor Browser for iOS + * Find it in the App Store + * Lots of fake Tor Browsers for iOS + * Very rudimentary + * Crashes on sleep + +# Using Orbot + + * Tor proxy for Android + * Find it on the Play Store or F-Droid + * Use it to run other Apps through Tor (like Twitter) + * Click start to run + * You can choose your exit country if you want (some countries don’t have exits!) + +# Using Orbot + + * Toggle “VPN mode” on main screen + * Then click “Orbot-enabled apps” + * Then select the apps you want to proxy with Tor + +# How do I get help using Tor? + +# Help using Tor + + * Tor Browser Manual: tb-manual.torproject.org + * Support Portal: https://support.torproject.org + * Open mailing lists: https://lists.torproject.org + * Chat: IRC OFTC network - easy access through https://webchat.oftc.net channel #tor + * https://tor.stackexchange.com + +# If you find a bug in Tor + + * https://trac.torproject.org + * Create a login + * Search for your issue to find any existing tickets + * If no ticket opened, open a new ticket with detailed description of the problem + +# Circumventing censorship with Tor + +# What do you do when Tor is blocked? + +# I downloaded Tor Browser, but it won’t connect + + * If this screen takes a long time and does not connect, you may need a bridge or pluggable transport + +# When torproject.org is blocked + + * Mirrors + * https://tor.eff.org/ + * http://tor.calyxinstitute.org/ (if https is blocked) + * GetTor email: gettor(a)torproject.org + * Contact from a Gmail or Riseup account + * Flash drive with Tor on it from someone you trust + * Get the EXE, DMG, tar.xz, don’t copy the installed folder + * Downloading Tor from a random website is dangerous! + +# Bridges and pluggable transports + + * Bridges are relays that are not listed publicly + * Get bridges directly from Tor Browser (moat) + * Or from the website https://bridges.torproject.org or send an email to bridges(a)torproject.org from a Gmail, or Riseup.net account + * Or get a bridge address from a trusted person + * Pluggable transports can be used like bridges to disguise Tor traffic (also called “built-in bridges”) + +# Bridges and pluggable transports + +# Request a bridge + + * moat method + +# Or select a built-in bridge + +# Pluggable transports + + * obfs4: makes Tor traffic look random; works in many situations including China (if not, try meek) + * fte: makes Tor traffic look like regular HTTP traffic + * meek-azure: makes it look like Microsoft traffic; works in China + * snowflake: proxies traffic through temporary proxies using WebRTC (under development) https://snowflake.torproject.org + +# OONI + + * Open Observatory of Network Interference:https://ooni.torproject.org + * Country-level reports of specific censorship tools in use on certain websites + * View their reports:https://explorer.ooni.torproject.org + * Or use your own OONI Probe to test websites: available in App Store and PlayStore + +# Sharing content anonymously with Tor + +# What are Onion Services? + +The regular internet allows adversaries to see what you are sharing and with whom, whether you're using Dropbox etc, downloading it from email or through your browser... + +...so Tor devised a sneaky way to hide both the file data and the related metadata! + +# Onion Services + + * Protection for both the user and the server + * User learns about xyz.onion + * Client and service meet at rendezvous point in the Tor cloud + * End-to-end encrypted without HTTPS + * Connections never go out to the “vanilla” internet + +# OnionShare + + * Secure, private, anonymous file sharing done easy, built on top of the Tor network + * Uses onion services to securely send files + * Creates an onion service where the file can be downloaded + * No need to trust third parties like Dropbox + * Download from https://onionshare.org + +# Connection + + * OnionShare connects to Tor network + * Click “add” then find the file you want to share. + +# Sharing + +Once the file is added, click “start sharing” + +# Sharing + + * Copy the xyz.onion link and send it to your contact + * Contact installs Tor Browser + * When they finish downloading you’ll see this → + +# Thank You + +Your contact here

1 0

[training/master] Tor training slides full deck 2019 - version 2
by pili＠torproject.org 20 Sep '19

20 Sep '19

commit a777c0472de7361183f79c6507a1db9fb9de9bc6 Author: gus <gus(a)torproject.org> Date: Thu Sep 19 08:56:25 2019 -0400 Tor training slides full deck 2019 - version 2 --- all-about-tor-full-pack.md | 284 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 284 insertions(+) diff --git a/all-about-tor-full-pack.md b/all-about-tor-full-pack.md new file mode 100644 index 0000000..cbfa3f2 --- /dev/null +++ b/all-about-tor-full-pack.md @@ -0,0 +1,284 @@ +# All About Tor + +Version 2019 - 02 + +# Agenda + + * Fill in this section + * With your agenda for the day + * To help your audience stay focused! + +# Let's begin + + * Do you use Tor? + * If not, why not? + * If yes, do you have any questions, concerns, issues, or doubts about using it? + * Do you teach others about Tor? + +# What is Tor? + + * Free software and an open network + * Mitigates against tracking, surveillance and censorship + * Run by a US non-profit and volunteers from all over the world + * It's Tor, not TOR + +# Why do we need Tor? + + * Government mass and targeted surveillance + * The business model of the Internet: big data, advertising, non-consensual tracking + * Surveillance threats from family, bosses, bad people on the Internet + +# Why do you need Tor? + + * Let’s discuss the work you do + * Adversaries and challenges + * Mitigations + * How Tor can help + +# little-t Tor or core tor + + * Tor the network daemon (a computer program) + * Presents a SOCKS or http proxy + * Location and source anonymity, similar to a VPN or regular proxy (but better!) + * Network of relays in many parts of the world + +# Who can see your activity without Tor or HTTPS? + + +# Who can see your activity with Tor and HTTPS? + +# Tor Browser + + * little-t tor plus patched Firefox + * Anyone snooping can’t see the websites you visit + * Websites can’t track you or see other sites you visit (cross-tracking) + * Prevents other privacy violations like fingerprinting or 3rd party cookies + * Writes nearly nothing to disk + * No browser history + * Cross platform: Windows, macOS, Linux and Android + +# Tor Browser in other languages + + * Go to https://torproject.org + * Select the language on dropdown menu + * Or select “Download in another language or platform” + +# Downloading Tor Browser + + * The safest way to download is from https://torproject.org + + * If https://torproject.org is blocked, try mirrors + * http://tor.calyxinstitute.org/ + * https://tor.eff.org/ + + * Or try GetTor - email gettor(a)torproject.org and in the message write “windows”, “osx” or “linux” (no quotes, no subject line) + +# Running Tor Browser the first time + +# Using Tor Browser + + * Default search engine: DuckDuckGo + * Bundled with NoScript, HTTPS Everywhere + * You should not add any other extensions nor enable any plugins (eg Flash)! + * Best practices: + Websites won’t know anything about you unless you login and tell them + +# Clicking on the site information menu will show your current circuit (and “New Circuit for this site” option) + +# Updating Tor Browser + +# Uninstalling Tor Browser + +Uninstalling Tor Browser is as easy as moving the folder to the trash! Then, empty the trash. + +Default Tor Browser folder locations: + + * Windows: desktop + * macOS: move the Tor Browser application to Trash and also the TorBrowser-Data folder (~/Library/Application Support/) + * Linux: home, or look for a name like “tor-browser_en-US” + +# Troubleshooting Tor Browser + + * Is your system clock correct? + * Is the browser already running? + * Are you being censored? + * Is your antivirus or firewall blocking Tor? + * Do you have a very old operating system? + * Try uninstalling and reinstalling + * Get help at https://support.torproject.org + +# More Tor Browser + +# The “onion” menu + + * New Identity: completely refreshes Tor Browser and its circuits; wipes all history; closes all tabs + * Tor network settings: censorship mitigation options; access to Tor log + * Check for Tor Browser update + +# Security Slider + +# NoScript + + * It’s not advisable to change settings in the “options” menu + * For example, adding sites to the “whitelist” can result in fingerprinting + * Instead, only “temporarily trust” blocked objects + +# DuckDuckGo + + * DuckDuckGo is the default search engine in Tor Browser + * Using Tor Browser prevents DDG from tracking users, even if they wanted to (they claim not to) + * Duckduckgo.com or https://3g2upl4pq6kufc4m.onion/ + +# Plugins, add-ons, Javascript + + * Do not add any new add-ons/extensions to Tor, and don’t enable any plugins + * For example, Flash plugin can reveal your real location + * Javascript is enabled by default, but is sanitized to preserve anonymity + * To prevent possible Javascript vulnerabilities, use the “safest” setting in the security slider + +# Mobile Tor + +# Things to know about mobile Tor + + * The design of mobile devices makes full privacy impossible + * Mobile Tor is best for censorship prevention + * Can also provide better privacy for some threat models + * We’re making it better all the time and better options for mobile devices are coming out soon + +# Tor Browser for Android + + * You don’t need to install two APPs (Orbot and Orfox) anymore + * Find it in the Play Store + * Or Guardian Project repository in F-Droid + * Or download .apk + +# Onion Browser + + * Tor Browser for iOS + * Find it in the App Store + * Lots of fake Tor Browsers for iOS + * Very rudimentary + * Crashes on sleep + +# Using Orbot + + * Tor proxy for Android + * Find it on the Play Store or F-Droid + * Use it to run other Apps through Tor (like Twitter) + * Click start to run + * You can choose your exit country if you want (some countries don’t have exits!) + +# Using Orbot + + * Toggle “VPN mode” on main screen + * Then click “Orbot-enabled apps” + * Then select the apps you want to proxy with Tor + +# How do I get help using Tor? + +# Help using Tor + + * Tor Browser Manual: tb-manual.torproject.org + * Support Portal: https://support.torproject.org + * Open mailing lists: https://lists.torproject.org + * Chat: IRC OFTC network - easy access through https://webchat.oftc.net channel #tor + * https://tor.stackexchange.com + +# If you find a bug in Tor + + * https://trac.torproject.org + * Create a login + * Search for your issue to find any existing tickets + * If no ticket opened, open a new ticket with detailed description of the problem + +# Circumventing censorship with Tor + +# What do you do when Tor is blocked? + +# I downloaded Tor Browser, but it won’t connect + + * If this screen takes a long time and does not connect, you may need a bridge or pluggable transport + +# When torproject.org is blocked + + * Mirrors + * https://tor.eff.org/ + * http://tor.calyxinstitute.org/ (if https is blocked) + * GetTor email: gettor(a)torproject.org + * Contact from a Gmail or Riseup account + * Flash drive with Tor on it from someone you trust + * Get the EXE, DMG, tar.xz, don’t copy the installed folder + * Downloading Tor from a random website is dangerous! + +# Bridges and pluggable transports + + * Bridges are relays that are not listed publicly + * Get bridges directly from Tor Browser (moat) + * Or from the website https://bridges.torproject.org or send an email to bridges(a)torproject.org from a Gmail, or Riseup.net account + * Or get a bridge address from a trusted person + * Pluggable transports can be used like bridges to disguise Tor traffic (also called “built-in bridges”) + +# Bridges and pluggable transports + +# Request a bridge + + * moat method + +# Or select a built-in bridge + +# Pluggable transports + + * obfs4: makes Tor traffic look random; works in many situations including China (if not, try meek) + * fte: makes Tor traffic look like regular HTTP traffic + * meek-azure: makes it look like Microsoft traffic; works in China + * snowflake: proxies traffic through temporary proxies using WebRTC (under development) https://snowflake.torproject.org + +# OONI + + * Open Observatory of Network Interference:https://ooni.torproject.org + * Country-level reports of specific censorship tools in use on certain websites + * View their reports:https://explorer.ooni.torproject.org + * Or use your own OONI Probe to test websites: available in App Store and PlayStore + +# Sharing content anonymously with Tor + +# What are Onion Services? + +The regular internet allows adversaries to see what you are sharing and with whom, whether you're using Dropbox etc, downloading it from email or through your browser... + +...so Tor devised a sneaky way to hide both the file data and the related metadata! + +# Onion Services + + * Protection for both the user and the server + * User learns about xyz.onion + * Client and service meet at rendezvous point in the Tor cloud + * End-to-end encrypted without HTTPS + * Connections never go out to the “vanilla” internet + +# OnionShare + + * Secure, private, anonymous file sharing done easy, built on top of the Tor network + * Uses onion services to securely send files + * Creates an onion service where the file can be downloaded + * No need to trust third parties like Dropbox + * Download from https://onionshare.org + +# Connection + + * OnionShare connects to Tor network + * Click “add” then find the file you want to share. + +# Sharing + +Once the file is added, click “start sharing” + +# Sharing + + * Copy the xyz.onion link and send it to your contact + * Contact installs Tor Browser + * When they finish downloading you’ll see this → + +# Thank You + +Your contact here

1 0

[tor-browser-build/master] Bug 31646: Update abicheck to require GLIBCXX_3.4.25
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit b16662aad8d9932819fea73746860ce9d8c711a4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 19 19:13:25 2019 +0200 Bug 31646: Update abicheck to require GLIBCXX_3.4.25 This is also fixing bug 31380. --- projects/firefox/abicheck.cc | 40 ++++++++++++++-------------------------- projects/gcc/config | 3 +++ 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/projects/firefox/abicheck.cc b/projects/firefox/abicheck.cc index cbecafa..ba5f858 100644 --- a/projects/firefox/abicheck.cc +++ b/projects/firefox/abicheck.cc @@ -1,35 +1,23 @@ /* * Bug 25485: Browser/TorBrowser/Tor/libstdc++.so.6: version `CXXABI_1.3.11' not found - * This program is borrowed from - * https://en.cppreference.com/w/cpp/error/uncaught_exception and is useful in - * determining the latest C++ ABI. Specifically this program requires - * `GLIBCXX_3.4.22` which we use to compare the version of the installed - * libstdc++.so.6 and the bundled version. If the program executes - * successfully, that means we should use the system version of libstdc++.so.6 - * and if not, that means we should use the bundled version. + * Bug 31646: Update abicheck to require newer libstdc++.so.6 + * This program is useful in determining if the libstdc++.so.6 installed + * on the system is recent enough. Specifically this program requires + * `GLIBCXX_3.4.25` which should be provided by libstdc++.so.6 from + * gcc >= 8.0.0. If the program executes successfully, that means we + * should use the system version of libstdc++.so.6 and if not, that means + * we should use the bundled version. + * + * We use std::random_device::entropy() in order to require GLIBCXX_3.4.25: + * https://github.com/gcc-mirror/gcc/blob/gcc-8_3_0-release/libstdc%2B%2B-v3/c… */ #include <iostream> -#include <exception> -#include <stdexcept> - -struct Foo { - int count = std::uncaught_exceptions(); - ~Foo() { - std::cout << (count == std::uncaught_exceptions() - ? "~Foo() called normally\n" - : "~Foo() called during stack unwinding\n"); - } -}; +#include <random> int main() { - Foo f; - try { - Foo f; - std::cout << "Exception thrown\n"; - throw std::runtime_error("test exception"); - } catch (const std::exception& e) { - std::cout << "Exception caught: " << e.what() << '\n'; - } + std::random_device rd; + std::cout << "entropy: " << rd.entropy() << std::endl; + return 0; } diff --git a/projects/gcc/config b/projects/gcc/config index d776a2c..a56089a 100644 --- a/projects/gcc/config +++ b/projects/gcc/config @@ -1,5 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +# Note: When updating the gcc version, if this includes a libstdc++ +# ABI change we should also update projects/firefox/abicheck.cc to +# require the new version. version: 8.3.0 var: container:

1 0

[community/master] README.md small style fixes
by pili＠torproject.org 20 Sep '19

20 Sep '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/master] Update Workflows
by pili＠torproject.org 20 Sep '19

20 Sep '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/master] Update contents.lr
by emmapeel＠torproject.org 20 Sep '19

20 Sep '19

commit 35a5ad7d4bf2b651d314e50cbd0ff84cf398ace8 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Fri Sep 20 07:53:41 2019 +0000 Update contents.lr

1 0

[community/master] Update contents.lr
by emmapeel＠torproject.org 20 Sep '19

20 Sep '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

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 20 Sep '19

20 Sep '19

commit c739017b532ad15dcbd166dafc135cae049f2d88 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 20 07:49:28 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- sk/sk.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index a62e5fc4d..ae47cd0d1 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-09-14 14:38+0200\n" -"PO-Revision-Date: 2019-09-20 07:18+0000\n" +"PO-Revision-Date: 2019-09-20 07:47+0000\n" "Last-Translator: Matúš <mato699(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -132,7 +132,7 @@ msgstr "Nastavenia sieťových zariadení a pripojení" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Additional Software" -msgstr "Ďalší softvér" +msgstr "Dodatočný softvér" #: ../lib/Tails/Persistence/Configuration/Presets.pm:102 msgid "Software installed when starting Tails" @@ -152,7 +152,7 @@ msgstr "Thunderbird" #: ../lib/Tails/Persistence/Configuration/Presets.pm:137 msgid "Thunderbird emails, feeds, and settings" -msgstr "E-maily a nastavenia z Thunderbirdu" +msgstr "E-maily, RSS zdroje a nastavenia z Thunderbirdu" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "GnuPG" @@ -184,7 +184,7 @@ msgstr "SSH klient" #: ../lib/Tails/Persistence/Configuration/Presets.pm:197 msgid "SSH keys, configuration and known hosts" -msgstr "SSH kľúče, konfigurácia a známi hostovia" +msgstr "SSH kľúče, konfigurácia a známe počitače" #: ../lib/Tails/Persistence/Configuration/Presets.pm:210 msgid "Dotfiles" @@ -201,7 +201,7 @@ msgstr "Sprievodca vytvorenia trvalého oddielu - Vytvorenie trvalého oddielu" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:93 msgid "Choose a passphrase to protect the persistent volume" -msgstr "Zvoľte si prístupové heslo za účelom ochrany perzistentného média" +msgstr "Zvoľte si prístupové heslo za účelom ochrany trvalého oddielu" #. TRANSLATORS: size, device vendor, device model #: ../lib/Tails/Persistence/Step/Bootstrap.pm:97 @@ -209,7 +209,7 @@ msgstr "Zvoľte si prístupové heslo za účelom ochrany perzistentného média msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "Perzistentné médium veľkosti %s bude vytvorené na zariadení %s %s. Dáta na tomto médiu budú uložené v zašifrovanej podobe chránenej prístupovým heslom." +msgstr "Trvalý oddiel veľkosti %s bude vytvorený na zariadení %s %s. Dáta na tomto oddiely budú uložené v zašifrovanej podobe chránenej prístupovým heslom." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:102 msgid "Create" @@ -220,7 +220,7 @@ msgid "" "Beware! Using persistence has consequences that must be well " "understood. Tails can't help you if you use it wrong! See the Encrypted " "persistence page of the Tails documentation to learn more." -msgstr "Pozor! Využívanie dátovej trvanlivosti so sebou obnáša isté následky, ktorým je nutné dobre porozumieť. Tails vam nepomôže ak ju použijete zle! Pozrite si Šifrovanie trvnanlivého oddielu v Tails dokumentácii o trvanlivosti dát ak sa chcete dozvedieť viac." +msgstr "Pozor! Využívanie trvalého oddielu so sebou obnáša isté následky, ktorým je nutné dobre porozumieť. Tails vam nepomôže ak ju použijete zle! Pozrite si Šifrovanie trvnanlivého oddielu v Tails dokumentácii o trvanlivosti dát ak sa chcete dozvedieť viac." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:170 msgid "Passphrase:" @@ -247,27 +247,27 @@ msgstr "Zlyhalo" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:292 msgid "Mounting Tails persistence partition." -msgstr "Pripája sa Tails perzistentná partícia." +msgstr "Pripája sa Tails trvalá partícia." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "The Tails persistence partition will be mounted." -msgstr "Tails perzistentná partícia bude pripojená." +msgstr "Tails trvalá partícia bude pripojená." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 msgid "Correcting permissions of the persistent volume." -msgstr "Korigujú sa oprávnenia perzistentného média." +msgstr "Korigujú sa oprávnenia trvalého oddielu." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 msgid "The permissions of the persistent volume will be corrected." -msgstr "Oprávnenia perzistentného média budú skorigované." +msgstr "Oprávnenia trvalého oddielu budú skorigované." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:315 msgid "Creating default persistence configuration." -msgstr "Vytvorenie predvolenej konfigurácie trvalého oddielu..." +msgstr "Vytváranie predvolenej konfigurácie trvalého oddielu." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:318 msgid "The default persistence configuration will be created." -msgstr "Predvolená konfigurácia trvalého oddielu bude vytvorená..." +msgstr "Predvolená konfigurácia trvalého oddielu bude vytvorená." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:333 msgid "Creating..." @@ -275,7 +275,7 @@ msgstr "Vytváram..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:336 msgid "Creating the persistent volume..." -msgstr "Vytvára sa perzistentné médium..." +msgstr "Vytvára sa trvalý oddiel..." #: ../lib/Tails/Persistence/Step/Delete.pm:53 msgid "Persistence wizard - Persistent volume deletion" @@ -283,13 +283,13 @@ msgstr "Sprievodca vytvorenia trvalého oddielu - Odstránenie trvalého oddielu #: ../lib/Tails/Persistence/Step/Delete.pm:56 msgid "Your persistent data will be deleted." -msgstr "Vaše perzistentné dáta budú uložené." +msgstr "Vaše trvalé dáta budú uložené." #: ../lib/Tails/Persistence/Step/Delete.pm:60 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." -msgstr "Perzistentná partícia %s (%s) na zariadení %s %s bude odstránená." +msgstr "Trvalý oddiel %s (%s) na zariadení %s %s bude odstránený." #: ../lib/Tails/Persistence/Step/Delete.pm:66 msgid "Delete" @@ -301,7 +301,7 @@ msgstr "Odstraňuje sa..." #: ../lib/Tails/Persistence/Step/Delete.pm:120 msgid "Deleting the persistent volume..." -msgstr "Odstraňuje sa perzistentné médium..." +msgstr "Odstraňuje sa trvalý oddiel..." #: ../lib/Tails/Persistence/Step/Configure.pm:88 msgid "Persistence wizard - Persistent volume configuration" @@ -309,7 +309,7 @@ msgstr "Sprievodca vytvorenia trvalého oddielu - Konfigurácia trvalého oddiel #: ../lib/Tails/Persistence/Step/Configure.pm:91 msgid "Specify the files that will be saved in the persistent volume" -msgstr "Zvoľte súbory, ktoré budú uložené v perzistentnom médiu" +msgstr "Zvoľte súbory, ktoré budú uložené na trvalom oddiely" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:95 @@ -329,4 +329,4 @@ msgstr "Ukladám..." #: ../lib/Tails/Persistence/Step/Configure.pm:198 msgid "Saving persistence configuration..." -msgstr "Ukladá sa konfigurácia trvanlivosti dát..." +msgstr "Ukladá sa konfigurácia trvalého oddielu..."

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 20 Sep '19

20 Sep '19

commit c91b13a1858cc9a9c9c02d56e542af11d7b77e37 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 20 07:19:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- sk/sk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sk/sk.po b/sk/sk.po index f1b97a39b..a62e5fc4d 100644 --- a/sk/sk.po +++ b/sk/sk.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-09-14 14:38+0200\n" -"PO-Revision-Date: 2019-09-20 06:44+0000\n" +"PO-Revision-Date: 2019-09-20 07:18+0000\n" "Last-Translator: Matúš <mato699(a)gmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "Súkromné údaje" #: ../lib/Tails/Persistence/Configuration/Presets.pm:57 msgid "Keep files stored in the `Persistent' directory" -msgstr "Zachovať súbory uložené v priečinku `Persistent'" +msgstr "Ponechať súbory uložené v `Trvalom adresári'" #: ../lib/Tails/Persistence/Configuration/Presets.pm:70 msgid "Browser Bookmarks" @@ -120,7 +120,7 @@ msgstr "Záložky prehliadača" #: ../lib/Tails/Persistence/Configuration/Presets.pm:72 msgid "Bookmarks saved in the Tor Browser" -msgstr "Záložky uložené v Tor Browseri" +msgstr "Záložky uložené v Prehliadači Tor" #: ../lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Network Connections"

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1557729 - Use principal for permission post prompts instead of URI. r=xeonchen
by gk＠torproject.org 20 Sep '19

20 Sep '19

commit f970a6e8a14d8f80f15be22fa1ed6b091b4d596b Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Fri Jun 14 15:49:25 2019 +0000 Bug 1557729 - Use principal for permission post prompts instead of URI. r=xeonchen Differential Revision: https://phabricator.services.mozilla.com/D35033 --HG-- extra : moz-landing-system : lando --- browser/modules/PermissionUI.jsm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/modules/PermissionUI.jsm b/browser/modules/PermissionUI.jsm index a45c551e1b8f..58a2f293c714 100644 --- a/browser/modules/PermissionUI.jsm +++ b/browser/modules/PermissionUI.jsm @@ -569,8 +569,8 @@ var PermissionPromptPrototype = { if (PrivateBrowsingUtils.isBrowserPrivate(browser)) { scope = SitePermissions.SCOPE_SESSION; } - SitePermissions.set( - principal.URI, + SitePermissions.setForPrincipal( + principal, this.permissionKey, promptAction.action, scope

1 0