December 2017 - tor-commits - lists.torproject.org

[collector/master] Update metrics-base.
by karsten＠torproject.org 15 Dec '17

15 Dec '17

commit ee7f1353a22b3d19857722b5b68604e2517012c5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 15 17:01:27 2017 +0100 Update metrics-base. --- src/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/build b/src/build index 4b34756..23c6e0b 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 4b34756ddd71ccaf0fc30e5f5bf0a813a297d4a3 +Subproject commit 23c6e0be5fab9463f137615053ef412e4da2315e

1 0

[tor/master] Merge remote-tracking branch 'isis/bug24612'
by nickm＠torproject.org 15 Dec '17

15 Dec '17

commit 519c6ba26c31d801b73e44ca5c760044a7fe06e5 Merge: db4873c46 c7dc65e03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 15 10:59:57 2017 -0500 Merge remote-tracking branch 'isis/bug24612' changes/bug24612 | 4 ++++ configure.ac | 7 +++++++ 2 files changed, 11 insertions(+)

1 0

[tor/master] build: Add pretty printing of results of rust autoconf checks.
by nickm＠torproject.org 15 Dec '17

15 Dec '17

commit c7dc65e033a63c6ba4d4f8e195265cb845f8e05f Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Dec 13 02:20:14 2017 +0000 build: Add pretty printing of results of rust autoconf checks. * ADDS several `AC_MSG_RESULT`s which print the result of our checks for our rust dependencies and a check for a suitable rustc compiler version. * FIXES #24612: https://bugs.torproject.org/24612 --- changes/bug24612 | 4 ++++ configure.ac | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug24612 b/changes/bug24612 new file mode 100644 index 000000000..df2717053 --- /dev/null +++ b/changes/bug24612 @@ -0,0 +1,4 @@ + o Minor fixes (build): + - Fix output of autoconf checks to display success messages for + Rust dependencies and a suitable rustc compiler version. Fixes + bug 24612; bugfix on tor-0.3.1.3-alpha. diff --git a/configure.ac b/configure.ac index 4a6dc80a9..e471f8f91 100644 --- a/configure.ac +++ b/configure.ac @@ -439,16 +439,21 @@ if test "x$enable_rust" = "xyes"; then fi if test ! -d "$TOR_RUST_DEPENDENCIES"; then AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) + ERRORED=1 fi for dep in $rust_crates; do if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) + ERRORED=1 fi done if test "x$NEED_MOD" = "x1"; then dnl When looking for dependencies from cargo, pick right directory TOR_RUST_DEPENDENCIES="../../src/ext/rust" fi + if test "x$ERRORED" = "x"; then + AC_MSG_RESULT([yes]) + fi fi dnl For now both MSVC and MinGW rust libraries will output static libs with @@ -465,6 +470,7 @@ if test "x$enable_rust" = "xyes"; then dnl Let's check the rustc version, too AC_MSG_CHECKING([rust version]) + RUSTC_VERSION=`$RUSTC --version` RUSTC_VERSION_MAJOR=`$RUSTC --version | cut -d ' ' -f 2 | cut -d '.' -f 1` RUSTC_VERSION_MINOR=`$RUSTC --version | cut -d ' ' -f 2 | cut -d '.' -f 2` if test "x$RUSTC_VERSION_MAJOR" = "x" -o "x$RUSTC_VERSION_MINOR" = "x"; then @@ -473,6 +479,7 @@ if test "x$enable_rust" = "xyes"; then if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 14; then AC_MSG_ERROR([rustc must be at least version 1.14]) fi + AC_MSG_RESULT([$RUSTC_VERSION]) fi AC_SEARCH_LIBS(socket, [socket network])

1 0

[collector/master] Exclude lastModifiedMillis in index.json.
by karsten＠torproject.org 15 Dec '17

15 Dec '17

commit b23232bd44c82defee92cbe1d697cafb7862205a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 14 10:13:11 2017 +0100 Exclude lastModifiedMillis in index.json. Fixes #24621. --- CHANGELOG.md | 6 ++++++ src/main/java/org/torproject/collector/index/CreateIndexJson.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c924f5e..2f4cd21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 1.?.? - 201?-??-?? + + * Minor changes + - Exclude lastModifiedMillis in index.json. + + # Changes in version 1.4.1 - 2017-10-26 * Medium changes diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 5c4daf9..c4399b8 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -163,7 +163,8 @@ public class CreateIndexJson extends CollecTorMain { private void writeIndex(IndexNode indexNode) throws Exception { indexJsonFile.getParentFile().mkdirs(); - Gson gson = new GsonBuilder().create(); + Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation() + .create(); String indexNodeString = gson.toJson(indexNode); for (String filename : new String[] {indexJsonFile.toString(), indexJsonFile + ".gz", indexJsonFile + ".xz", indexJsonFile + ".bz2"}) {

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 15 Dec '17

15 Dec '17

commit 46204f7c16a40468b852c0406a531c7649e4bb43 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 15 12:47:03 2017 +0000 Update translations for tor-launcher-network-settings_completed --- es/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index c9254ff92..a9850f71b 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Pincha en "Connect" para conectar con Tor"> -<!ENTITY torSettings.configurePrompt "Pulsa en "Configure" para ajustar la configuración de red, si estás en un país que censura a Tor (tales como China, Irán, Siria) o si estás conectada desde una red privada que requiere un proxy."> +<!ENTITY torSettings.configurePrompt "Pulse "Configurar" para ajustar la configuración de red si está en un país que censura Tor (como Egipto, China, Turquía) o si está conectando desde una red privada que requiere un proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Dec '17

15 Dec '17

commit 1fe92173cb8590d9918a88d47201608f940151a6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 15 12:46:57 2017 +0000 Update translations for tor-launcher-network-settings --- es/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/network-settings.dtd b/es/network-settings.dtd index 6af0fe108..a9850f71b 100644 --- a/es/network-settings.dtd +++ b/es/network-settings.dtd @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Pincha en "Connect" para conectar con Tor"> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Pulse "Configurar" para ajustar la configuración de red si está en un país que censura Tor (como Egipto, China, Turquía) o si está conectando desde una red privada que requiere un proxy."> <!ENTITY torSettings.configure "Configurar"> <!ENTITY torSettings.connect "Conectar">

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 15 Dec '17

15 Dec '17

commit 6911d7d08b9abf05cd4a06d37a5921fc1c27d0b2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 15 11:20:36 2017 +0000 Update translations for tor-browser-manual --- sv/sv.po | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/sv/sv.po b/sv/sv.po index cb1e40156..025727471 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -7,12 +7,13 @@ # Yoga Andersson <yoga.andersson(a)gmail.com>, 2016 # Nikolai Stenfors <nikolai.stenfors(a)bahnhof.se>, 2016 # Bo Serrander <bserrander(a)gmail.com>, 2017 +# Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Bo Serrander <bserrander(a)gmail.com>, 2017\n" +"Last-Translator: Jacob Andersson <jacob.c.andersson(a)protonmail.com>, 2017\n" "Language-Team: Swedish (https://www.transifex.com/otf/teams/1519/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -932,6 +933,13 @@ msgid "" "connections. Tor Browser will warn you that all activity and downloads will " "be stopped, so take this into account before clicking “New Identity”." msgstr "" +"Denna inställningen är användbar ifall du vill förebygga din föregående " +"aktivitet ska vara länkbar med vad du har gjort innan. Vid val av denna " +"inställningen kommer att stänga alla öppna tabs, fönster, all privat data " +"som cookies och webbläsar historik kommer att tas bort, och nya Tor kretsar " +"kommer användas för alla uppkopplingar. Tor webläsaren kommer att varna dig " +"att all aktivitet och nedladdningar kommer att stoppas, tänk på detta innan " +"du klicka \"Ny identitet\"." #: managing-identities.page:123 msgid "New Tor Circuit for this Site" @@ -962,18 +970,24 @@ msgid "" "Onion services (formerly known as “hidden services”) are services (like " "websites) that are only accessible through the Tor network." msgstr "" +"Onion tjänster (innan känt som \"gömda tjänster) är tjänster (t.ex " +"webbsidor) som endast är synliga via Tor nätverket" #: onionsites.page:16 msgid "" "Onion services offer several advantages over ordinary services on the non-" "private web:" msgstr "" +"Onion tjänster har fler fördelar över vanliga tjänster för den icke privata " +"webben." #: onionsites.page:23 msgid "" "An onion services’s location and IP address are hidden, making it difficult " "for adversaries to censor it or identify its operators." msgstr "" +"En Onions användares plats och IP adress är gömd, vilket gör det svårt för " +"motståndare att censurera den eller identifiera användaren." #: onionsites.page:29 msgid "" @@ -981,6 +995,9 @@ msgid "" " you do not need to worry about <link xref=\"secure-connections\">connecting" " over HTTPS</link>." msgstr "" +"All trafik mellan Tor användaren och Onions tjänster är end-to-end " +"krypterat, så du behöver inte oroa dig över <link xref=\"secure-" +"connections\"> förbinder över HTTPS </link>." #: onionsites.page:36 msgid "" @@ -989,6 +1006,9 @@ msgid "" " that it is connecting to the right location and that the connection is not " "being tampered with." msgstr "" +"Adressen för en Onion tjänst genereras automatisk, användaren behöver inte " +"köpa ett domän namn; .onion URL som hjälper Tor säkerställa att förbindelsen" +" är till rätt plats och att anslutningen inte blir manipuleras." #: onionsites.page:46 msgid "How to access an onion service" @@ -1013,6 +1033,9 @@ msgid "" "service in order to connect to it. An onion address is a string of sixteen " "mostly random letters and numbers, followed by “.onion”." msgstr "" +"Precis som vilken annan webbsida behöver du veta adressen till en onion " +"tjänst för att kunna ansluta dig till den. En Onion adress är en sträng med " +"sexton slumpmässigt valda bokstäver och nummer följt av .onion." #: onionsites.page:58 troubleshooting.page:10 msgid "Troubleshooting" @@ -1024,6 +1047,9 @@ msgid "" "entered the 16-character onion address correctly: even a small mistake will " "stop Tor Browser from being able to reach the site." msgstr "" +"Ifall du inte kan nå Onion tjänsten du vill, dubbel kolla att de 16 tecken i" +" onion adressen stämmer. Även ett lite misstag kan stoppa Tor webbläsaren " +"från att kunna nå sidan." #: onionsites.page:64 msgid "" @@ -1031,6 +1057,9 @@ msgid "" "later. There may be a temporary connection issue, or the site operators may " "have allowed it to go offline without warning." msgstr "" +"Om du fortfarande inte kan ansluta till Onion tjänsten, var god att försök " +"senare. Det kan finnas tillfälliga anslutnings problem, eller har en sid " +"operatör låtit den gå offline utan att ge en förvarning. " #: onionsites.page:69 msgid ""

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 15 Dec '17

15 Dec '17

commit 4f42d64af14946d01d3052840376c49caf8aa743 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 15 10:46:12 2017 +0000 Update translations for tails-persistence-setup_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index ba1fa51bc..4f0ae660f 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-12-04 19:54+0000\n" +"PO-Revision-Date: 2017-12-15 10:17+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 15 Dec '17

15 Dec '17

commit 79ec89d3192c09aaaeacaae84fa5f87217953dad Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 15 10:46:06 2017 +0000 Update translations for tails-persistence-setup --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index ba1fa51bc..4f0ae660f 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-12-04 19:54+0000\n" +"PO-Revision-Date: 2017-12-15 10:17+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-onioncircuits_completed] Update translations for tails-onioncircuits_completed
by translation＠torproject.org 15 Dec '17

15 Dec '17

commit 16f43948dd45268536b832909bdf53ed890c89a9 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 15 10:19:16 2017 +0000 Update translations for tails-onioncircuits_completed --- fr/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/onioncircuits.pot b/fr/onioncircuits.pot index deef8438b..36bc142fa 100644 --- a/fr/onioncircuits.pot +++ b/fr/onioncircuits.pot @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-08-03 13:00+0000\n" -"PO-Revision-Date: 2017-11-08 22:42+0000\n" +"PO-Revision-Date: 2017-12-15 10:16+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0