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

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit ea00f1c6e034cdce7a989d3a2584f35bc3204dfa Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 15:23:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+pt-BR.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 4e9e016eb..844db586d 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -16,6 +16,7 @@ # Luciana Dark Blue <lucianadarkblue(a)gmail.com>, 2019 # Chacal E., 2019 # Emma Peel, 2019 +# m tk, 2019 # msgid "" msgstr "" @@ -23,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-29 10:45+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: m tk, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit ae4fa150f07899b7681e7c843463941a7cfa22d5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 15:23:41 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+pt-BR.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index dfbfc2312..63e9b7e62 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -16,6 +16,7 @@ # Luciana Dark Blue <lucianadarkblue(a)gmail.com>, 2019 # Chacal E., 2019 # Emma Peel, 2019 +# m tk, 2019 # msgid "" msgstr "" @@ -23,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-29 10:45+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: m tk, 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -779,7 +780,7 @@ msgstr "Perguntas frequentes sobre marcas comerciais da Tor" #: lego/templates/banner.html:2 lego/templates/banner.html:4 #: templates/banner.html:2 templates/banner.html:4 msgid "Close banner" -msgstr "" +msgstr "Fechar o banner" #: lego/templates/banner.html:14 templates/banner.html:14 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[community/master] small edits
by emmapeel＠torproject.org 31 Oct '19

31 Oct '19

commit 6577591736b8b16e90a48972ffe457d63f746012 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Fri Oct 11 20:04:39 2019 +0000 small edits --- content/onion-services/setup/contents.lr | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index a33df07..5389808 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -8,7 +8,7 @@ image: cloud-upload-alt --- _template: layout.html --- -title: Set up your Onion Service +title: Set up Your Onion Service --- subtitle: Learn how to set up a .onion site of your very own. --- @@ -20,11 +20,11 @@ html: two-columns-page.html --- body: -This guide will go over setting up an onion service for your website: +This guide shows you how to set up an onion service for your website. ## Step 0: Get a working Tor -As part of this guide we will assume you have a functional Tor in your machine. Tor should be up and running correctly for this guide to work. You should also know where Tor's configuration files are. +As part of this guide, we will assume you have a functional Tor in your machine. Tor should be up and running correctly for this guide to work. You should also know where Tor's configuration files are. To setup Tor, Windows users can follow the [Windows howto](https://2019.www.torproject.org/docs/tor-doc-windows.html.en), OS X users should follow the [OS X howto](https://2019.www.torproject.org/docs/tor-doc-osx.html.en), and Linux/BSD/Unix users should follow the [Unix howto](https://2019.www.torproject.org/docs/tor-doc-unix.html.en). @@ -61,18 +61,18 @@ Now save your `torrc` and restart Tor. If Tor starts up again, great. Otherwise, something is wrong. First look at your logfiles for hints. It will print some warnings or error messages. That should give you an idea what went wrong. -Typically there are typos in the torrc or wrong directory permissions (See the logging FAQ [FIXME add link] entry if you don't know how to enable or find your log file.) +Typically, there are typos in the torrc or wrong directory permissions (See the logging FAQ [FIXME add link] entry if you don't know how to enable or find your log file.) When Tor starts, it will automatically create the `HiddenServiceDir` that you specified (if necessary). Make sure this is the case. ## Step 4: Test that your onion service works Now to get your onion service address, go to your `HiddenServiceDir` directory, and find a file named `hostname`. -The `hostname` file in your hidden service configuration directory contains the hostname for your new Onion v3 hidden service. +The `hostname` file in your hidden service configuration directory contains the hostname for your new onion v3 hidden service. The other files are your hidden service keys, so it is imperative that these are kept private. -If your keys leak, other people can impersonate your hidden service, deeming it compromised, useless and dangerous to visit. +If your keys leak, other people can impersonate your onion service, deeming it compromised, useless, and dangerous to visit. -Now you can connect to your onion service using the Tor Browser and you should get the html page you setup back in step 1. +Now you can connect to your onion service using Tor Browser, and you should get the html page you setup back in step 1. If it doesn't work, look in your logs for some hints, and keep playing with it until it works. ## Step 5: More advanced tips

1 0

[community/master] better strings for l10n. please add one sentence per line.
by emmapeel＠torproject.org 31 Oct '19

31 Oct '19

commit d8e9c59d9311e93045db94c491a8615523a33bf8 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Oct 31 15:41:39 2019 +0100 better strings for l10n. please add one sentence per line. --- content/user-research/contents.lr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 2ad1aeb..31b93ef 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -20,4 +20,7 @@ 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. +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

[translation/abouttor-homepage] https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit 12a79bb5cffbc2b2db3a71525e00a638b3de6b53 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 14:15:05 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage --- it/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/aboutTor.dtd b/it/aboutTor.dtd index a7d1b2ffc..a250de895 100644 --- a/it/aboutTor.dtd +++ b/it/aboutTor.dtd @@ -34,4 +34,4 @@  <!ENTITY aboutTor.ey2019.mozilla "Dai oggi, e Mozilla ricambierà la tua donazione."> <!ENTITY aboutTor.ey2019.tracking "Tracciamento, sorveglianza e censura sono ampiamente diffuse in rete."> -<!ENTITY aboutTor.ey2019.takeback "Take back the Internet with Tor"> +<!ENTITY aboutTor.ey2019.takeback "Riprendi possesso di internet con Tor">

1 0

[metrics-lib/master] Make NetworkStatusEntryImpl#parseSLine thread-safe.
by karsten＠torproject.org 31 Oct '19

31 Oct '19

commit bde697f44702c3f93cfff7953ff8f5962582e2e1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 24 21:29:07 2019 +0200 Make NetworkStatusEntryImpl#parseSLine thread-safe. The bug was that we accessed static class members, namely the two maps NetworkStatusEntryImpl#flagIndexes and #flagStrings, during instance creation without synchronization. This worked just fine with a single thread creating instances, but it breaks with multiple threads doing that at the same time. The fix is to keep a separate map per NetworkStatusImpl instance and share that between all its NetworkStatusEntryImpl instances. This doesn't save as much memory as sharing maps between all NetworksStatusEntryImpl instances ever created, but it's a reasonable compromise between memory and runtime efficiency. In contrast to that, synchronizing map access would have put a major runtime performance penalty on parsing. Fixes #32194. --- CHANGELOG.md | 3 +++ .../descriptor/impl/NetworkStatusEntryImpl.java | 27 +++++++++++----------- .../descriptor/impl/NetworkStatusImpl.java | 8 ++++++- .../impl/RelayNetworkStatusConsensusImpl.java | 3 ++- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c7610a..73022cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 2.?.? - 2019-??-?? + * Medium changes + - Make NetworkStatusEntryImpl#parseSLine thread-safe. + # Changes in version 2.8.0 - 2019-10-18 diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 2ddaaa0..e6a78f6 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -12,7 +12,6 @@ import org.torproject.descriptor.NetworkStatusEntry; import java.util.ArrayList; import java.util.BitSet; import java.util.EnumSet; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -48,13 +47,19 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { return lines; } + private Map<String, Integer> flagIndexes; + + private Map<Integer, String> flagStrings; + protected NetworkStatusEntryImpl(DescriptorImpl parent, int offset, - int length, boolean microdescConsensus) - throws DescriptorParseException { + int length, boolean microdescConsensus, Map<String, Integer> flagIndexes, + Map<Integer, String> flagStrings) throws DescriptorParseException { this.parent = parent; this.offset = offset; this.length = length; this.microdescConsensus = microdescConsensus; + this.flagIndexes = flagIndexes; + this.flagStrings = flagStrings; this.parseStatusEntryBytes(); this.clearAtMostOnceKeys(); } @@ -160,21 +165,17 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { this.orAddresses.add(parts[1]); } - private static Map<String, Integer> flagIndexes = new HashMap<>(); - - private static Map<Integer, String> flagStrings = new HashMap<>(); - private void parseSLine(String[] parts) throws DescriptorParseException { this.parsedAtMostOnceKey(Key.S); - BitSet flags = new BitSet(flagIndexes.size()); + BitSet flags = new BitSet(this.flagIndexes.size()); for (int i = 1; i < parts.length; i++) { String flag = parts[i]; - if (!flagIndexes.containsKey(flag)) { - flagStrings.put(flagIndexes.size(), flag); - flagIndexes.put(flag, flagIndexes.size()); + if (!this.flagIndexes.containsKey(flag)) { + this.flagStrings.put(this.flagIndexes.size(), flag); + this.flagIndexes.put(flag, this.flagIndexes.size()); } - flags.set(flagIndexes.get(flag)); + flags.set(this.flagIndexes.get(flag)); } this.flags = flags; } @@ -353,7 +354,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { if (this.flags != null) { for (int i = this.flags.nextSetBit(0); i >= 0; i = this.flags.nextSetBit(i + 1)) { - result.add(flagStrings.get(i)); + result.add(this.flagStrings.get(i)); } } return result; diff --git a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java index 0694aff..b763f30 100644 --- a/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -10,7 +10,9 @@ import org.torproject.descriptor.NetworkStatusEntry; import java.io.File; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -19,6 +21,10 @@ import java.util.TreeMap; * delegate the specific parts to the subclasses. */ public abstract class NetworkStatusImpl extends DescriptorImpl { + protected Map<String, Integer> flagIndexes = new HashMap<>(); + + protected Map<Integer, String> flagStrings = new HashMap<>(); + protected NetworkStatusImpl(byte[] rawDescriptorBytes, int[] offsetAndLength, File descriptorFile, boolean containsDirSourceEntries, boolean blankLinesAllowed) throws DescriptorParseException { @@ -140,7 +146,7 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { protected void parseStatusEntry(int offset, int length) throws DescriptorParseException { NetworkStatusEntryImpl statusEntry = new NetworkStatusEntryImpl( - this, offset, length, false); + this, offset, length, false, this.flagIndexes, this.flagStrings); this.statusEntries.put(statusEntry.getFingerprint(), statusEntry); List<String> unrecognizedStatusEntryLines = statusEntry .getAndClearUnrecognizedLines(); diff --git a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java index 904dc35..66b8eaa 100644 --- a/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java +++ b/src/main/java/org/torproject/descriptor/impl/RelayNetworkStatusConsensusImpl.java @@ -119,7 +119,8 @@ public class RelayNetworkStatusConsensusImpl extends NetworkStatusImpl protected void parseStatusEntry(int offset, int length) throws DescriptorParseException { NetworkStatusEntryImpl statusEntry = new NetworkStatusEntryImpl(this, - offset, length, this.microdescConsensus); + offset, length, this.microdescConsensus, this.flagIndexes, + this.flagStrings); this.statusEntries.put(statusEntry.getFingerprint(), statusEntry); List<String> unrecognizedStatusEntryLines = statusEntry .getAndClearUnrecognizedLines();

1 0

[metrics-web/master] Update documentation of bridge or_addresses.
by karsten＠torproject.org 31 Oct '19

31 Oct '19

commit a15b169a00c8a7c44e0cf73a8fa26572f195a189 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Oct 31 14:42:14 2019 +0100 Update documentation of bridge or_addresses. Fixes #32322. --- src/main/resources/web/jsps/onionoo.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index 0448b6f..05e9723 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/main/resources/web/jsps/onionoo.jsp @@ -1852,7 +1852,8 @@ IP version the bridge uses and to detect whether the bridge changed its address. Sanitized IP addresses always change on the 1st of every month at 00:00:00 UTC, regardless of the bridge actually changing its IP address. -TCP ports are not sanitized. +TCP ports are sanitized in a similar way as IP addresses to hide the +location of bridges with unusual TCP ports. </p> </li>

1 0

[community/master] We want to link to training resources in the training repo
by pili＠torproject.org 31 Oct '19

31 Oct '19

commit 01dc04ef3917ef242f2a3a7626e7dc8d157fabba Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Oct 31 14:36:32 2019 +0100 We want to link to training resources in the training repo --- databags/training-resources.json | 11 +++++++++++ templates/resources.html | 21 +++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/databags/training-resources.json b/databags/training-resources.json new file mode 100644 index 0000000..b1fecd7 --- /dev/null +++ b/databags/training-resources.json @@ -0,0 +1,11 @@ +{ + "all-about-tor" : + { + "label" : "All About Tor", + "name" : "all-about-tor", + "filename" : "all-about-tor-full-pack", + "formats" : ["odp","md"], + "description" : "Full set of slides for Tor Trainings", + "date" : "2019" + } +} \ No newline at end of file diff --git a/templates/resources.html b/templates/resources.html index d40c313..1ee86d9 100644 --- a/templates/resources.html +++ b/templates/resources.html @@ -14,16 +14,21 @@ </tr> </thead> <tbody> - {% from "macros/resources.html" import render_resource %} - {% for item in this.attachments %} - {{ render_resource(item) }} - {% endfor %} + {% for id, item in bag('training-resources').items() %} + <tr> + <td>{{ item.label}}</td> + <td>{{ item.description }}</td> + <td> + {% for format in item.formats %} + <a href="https://gitweb.torproject.org/community/training.git/plain/{{ item.date }}/{{ item.name }}/{{ item.filename }}.{{format}}">{{ format }}</a> + {% endfor %} + </td> + <td>{{ item.date }}</td> + </tr> + {% endfor %} </tbody> </table> </div> </div> </div> -</div> - - - +</div> \ No newline at end of file

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 31 Oct '19

31 Oct '19

commit 42b8cb48992b446b0ace2bd47e300d0cdb502188 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 31 13:16:51 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+it.po | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/code_of_conduct+it.po b/code_of_conduct+it.po index 72ea63d65..045381370 100644 --- a/code_of_conduct+it.po +++ b/code_of_conduct+it.po @@ -73,8 +73,8 @@ msgstr "" "stato creato al fine di offrire linee guida per i collaboratori. I " "dipendenti e gli appaltatori del The Tor Project, Inc. (TPI) sono anch'essi " "soggetti alle politiche e procedure aziendali. Costoro sono liberi di " -"contattare il Responsabile Risorse Umane per porre domande o presentare " -"reclami." +"contattare il Responsabile Risorse Umane per porre domande o condividere " +"preoccupazioni." #. type: Plain text #: ../code_of_conduct.txt:23 @@ -177,6 +177,9 @@ msgid "" " questions or concerns. Public key:\n" " https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" msgstr "" +"da fare: prontamente mandare una email: tor-community-council(a)lists.torproject.org con \n" +"domande o preoccupazioni. Chiave pubblica:\n" +"https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact\n" #. type: Plain text #: ../code_of_conduct.txt:53 @@ -253,17 +256,21 @@ msgstr "" #: ../code_of_conduct.txt:85 msgid "Exercise consideration and respect in your speech and actions." msgstr "" +"Esercita considerazione e rispetto nella tua esposizione e nelle tue azioni." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:87 msgid "Attempt collaboration and dialog before engaging in conflict." msgstr "" +"Prova a collaborare e a dialogare prima di essere coinvolto in una lite." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:89 msgid "" "Refrain from demeaning, discriminatory, or harassing behavior and speech." msgstr "" +"Astieniti da osservazioni degradanti e discriminatorie o da un comportamento" +" molesto." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:92 @@ -271,6 +278,8 @@ msgid "" "Be mindful of your surroundings and of your fellow participants. Alert " "community leaders if you notice:" msgstr "" +"Sii consapevole del tuo contesto e della presenza dei tuoi compagni. Allerta" +" i leader della comunità se noti:" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:94 @@ -280,12 +289,12 @@ msgstr "una situazione pericolosa" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:96 msgid "someone in distress" -msgstr "" +msgstr "qualcuno in difficoltà" #. type: Bullet: ' - ' #: ../code_of_conduct.txt:98 msgid "violations of this code of conduct, even if they seem minor" -msgstr "" +msgstr "violazioni di questo codice di condotta, seppur minime" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:101 @@ -293,11 +302,14 @@ msgid "" "Remember that community event venues may be shared with members of the " "public. Please be respectful to everyone using these locations." msgstr "" +"Ricorda che le piattaforme per gli eventi della comunità potrebbero essere " +"condivisi con il pubblico. Ti preghiamo di essere rispettoso di chiunque sia" +" presente su queste piattaforme." #. type: Bullet: ' * ' #: ../code_of_conduct.txt:103 msgid "Respect the privacy of your fellow community members." -msgstr "" +msgstr "Rispetta la privacy dei tuoi compagni di comunità." #. type: Plain text #: ../code_of_conduct.txt:106 @@ -313,6 +325,8 @@ msgstr "" #: ../code_of_conduct.txt:109 msgid "The following behaviors are unacceptable within our community:" msgstr "" +"I seguenti comportamenti non sono accettati all'interno della nostra " +"comunità:" #. type: Bullet: ' * ' #: ../code_of_conduct.txt:114

1 0

[newsletter/master] Update lego
by hiro＠torproject.org 31 Oct '19

31 Oct '19

commit 5d57ea50962c1cab2bb5397ae394447803791c75 Author: hiro <hiro(a)torproject.org> Date: Thu Oct 31 13:56:59 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 0b9ae1c..8a4ddc7 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 0b9ae1cd239ba5d0968833fd39b936ef81b37cda +Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5

1 0