June 2018 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 13 Jun '18

13 Jun '18

commit 50dcb4541dc2565af163ca53ba2591328972c7ca Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 13 21:15:30 2018 +0000 Update translations for https_everywhere --- hr_HR/https-everywhere.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hr_HR/https-everywhere.dtd b/hr_HR/https-everywhere.dtd index 536ebb14d..c5df96ada 100644 --- a/hr_HR/https-everywhere.dtd +++ b/hr_HR/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Enkriptirajte web! Automatski koristite HTTPS sigurnost na mnogim stranicama."> <!ENTITY https-everywhere.about.version "Inačica"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> +<!ENTITY https-everywhere.about.rulesets_version "Nizovi pravila inačice za"> <!ENTITY https-everywhere.about.add_new_rule "Dodaj novo pravilo"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Donirajte EFF-u"> @@ -12,16 +12,16 @@ <!ENTITY https-everywhere.menu.showCounter "Prikaži brojač"> <!ENTITY https-everywhere.menu.viewAllRules "Pogledaj sva pravila"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> +<!ENTITY https-everywhere.options.generalSettings "Opće postavke"> <!ENTITY https-everywhere.options.advancedSettings "Napredne postavke"> -<!ENTITY https-everywhere.options.importSettings "Import Settings"> +<!ENTITY https-everywhere.options.importSettings "Uvezi postavke"> <!ENTITY https-everywhere.options.import "Uvezi"> <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> <!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> -<!ENTITY https-everywhere.options.imported "Your settings have been imported."> +<!ENTITY https-everywhere.options.autoUpdateRulesets "Automatski ažuriraj nizove pravila"> +<!ENTITY https-everywhere.options.imported "Vaše postavke su uvezene."> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.export_settings "Izvezi postavke"> <!ENTITY https-everywhere.prefs.reset_defaults "Vrati na početno"> <!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?">

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Revert "Bug 23916: Add new MAR signing key"
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit d77a0ec835e8ee8e4beab614722c02fa7fd96119 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 13 08:58:27 2018 +0000 Revert "Bug 23916: Add new MAR signing key" This reverts commit e984b8c54c7592057c060f7a2e13b378a355b1d0. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1225 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1225 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index cce786025698..1d94f88ad73b 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index caf3eca56804..474706c4b73c 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 26045: Add new MAR signing keys
by gk＠torproject.org 13 Jun '18

13 Jun '18

commit 1f78032d48850e0197608ac1d9906a095e2a4c06 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 13 09:03:59 2018 +0000 Bug 26045: Add new MAR signing keys We need to have new MAR singning keys for our watershed update: both keys we shipped so far need to get replaced by news ones, now using SHA-384 as their hash algorithm. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1225 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1225 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 1d94f88ad73b..ec74f89dc807 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 474706c4b73c..0103a171de88 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[tor/master] Silence warning of relaycell/circbw tst.
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 99974d4c1e28cb96d82734ef7cf3531576da610a Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 13 14:14:17 2018 +0300 Silence warning of relaycell/circbw tst. Shouldn't send RELAY_COMMAND_DATA cell with 0 stream id. --- src/test/test_relaycell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c b/src/test/test_relaycell.c index 1db520273..f92033920 100644 --- a/src/test/test_relaycell.c +++ b/src/test/test_relaycell.c @@ -221,7 +221,7 @@ test_circbw_relay(void *arg) ASSERT_UNCOUNTED_BW(); /* Data cell on stream 0: not counted */ - PACK_CELL(0, RELAY_COMMAND_DATA, "Data1234"); + PACK_CELL(1, RELAY_COMMAND_DATA, "Data1234"); connection_edge_process_relay_cell(&cell, TO_CIRCUIT(circ), edgeconn, circ->cpath); ASSERT_UNCOUNTED_BW();

1 0

[tor/master] Merge remote-tracking branch 'asn-github/bug26358'
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit ed7b13581234c0c1bbef3126f3dba5cd2892f950 Merge: 7cc3cdef2 99974d4c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 10:00:37 2018 -0400 Merge remote-tracking branch 'asn-github/bug26358' src/test/test_relaycell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit ca6d289c00e5e18b24c7f463e709125e545d4405 Merge: 049ba6674 7e7585d0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:59:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.3] Add a missing "return -1" when checking for Ed25519 ID loops
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 6c35ad08cf36d36a5e2ff888cb7dc8c8df5efe10 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 22 08:54:17 2018 -0400 Add a missing "return -1" when checking for Ed25519 ID loops Fixes bug 26158; bugfix on 0.3.0.1-alpha. --- changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug26158 b/changes/bug26158 new file mode 100644 index 000000000..5ae1c3060 --- /dev/null +++ b/changes/bug26158 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - Relays now correctly block attempts to re-extend to the previous + relay by Ed25519 identity. Previously they would warn in this case, + but not actually reject the attempt. Fixes bug 26158; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 16cef0e56..41ae51a3f 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1267,6 +1267,7 @@ circuit_extend(cell_t *cell, circuit_t *circ) log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "Client asked me to extend back to the previous hop " "(by Ed25519 ID)."); + return -1; } n_chan = channel_get_for_extend((const char*)ec.node_id,

1 0

[tor/release-0.3.3] Merge branch 'bug26158_031' into maint-0.3.1
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 94f3007627f4161ca4f1fb5e41f11cc8ff78ca2b Merge: 16381b579 6c35ad08c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:01 2018 -0400 Merge branch 'bug26158_031' into maint-0.3.1 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit c7d2671f78df07bd66b750f05e6a4699dc7e18b2 Merge: 2e71f3ccf 049ba6674 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 13 Jun '18

13 Jun '18

commit 049ba66746006e45d8033d8f88f97ba61d8c5631 Merge: 1c80eb92f 6017447e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)

1 0