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

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

14 Nov '17

commit 8cd12e1c44d80ce1e34f56d9269fe85670799152 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 01:46:54 2017 +0000 Update translations for tor-launcher-network-settings --- nb/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 0294ffa79..2b0df8d95 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -1,6 +1,6 @@ <!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor"> <!ENTITY torsettings.wizard.title.default "Koble til Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> +<!ENTITY torsettings.wizard.title.configure "Nettverksinnstillinger for Tor"> <!ENTITY torsettings.wizard.title.connecting "Etablering av tilkobling">  @@ -10,7 +10,7 @@  <!ENTITY torSettings.connectPrompt "Klikk "koble til" for å koble til Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as China, Iran, Syria) or if you are connecting from a private network that requires a proxy."> +<!ENTITY torSettings.configurePrompt "Klikk "sett opp" for å justere nettverksinnstillinger hvis du er i et land som sensurerer Tor (som Kina, Iran, Syria,) eller hvis du kobler til fra et privat nettverk som krever en mellomtjener."> <!ENTITY torSettings.configure "Sett opp"> <!ENTITY torSettings.connect "Koble til"> @@ -25,7 +25,7 @@ <!ENTITY torsettings.optional "Valgfritt"> -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett"> <!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> <!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype"> <!ENTITY torsettings.useProxy.address "Adresse:"> @@ -48,7 +48,7 @@ <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> <!ENTITY torsettings.proxyHelpTitle "Mellomtjenerhjelp"> -<!ENTITY torsettings.proxyHelp1 "A local proxy is needed when connecting through a company, school, or university network. If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a proxy is needed."> +<!ENTITY torsettings.proxyHelp1 "En lokal mellomtjener trengs når du kobler til fra et bedrifts-, skole-, eller universitets-nettverk. Hvis du ikke er sikker på hvordan du besvarer dette spørsmålet, sjekk internettinnstillingene i en annen nettleser, eller sjekk nettverksinnstillingene på systemet ditt for å se hvorvidt en mellomtjener behøves."> <!ENTITY torsettings.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett"> <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 50fbede4597d143411b3739e88d2c3d8ef457fbd Merge: fea5c8a01 1b9bb2c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.1] Merge branch 'bug22895_027' into maint-0.2.9
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c Merge: 543fd89fb 89c0a00a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:35:59 2017 -0500 Merge branch 'bug22895_027' into maint-0.2.9 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'bug22895_027' into maint-0.2.9
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c Merge: 543fd89fb 89c0a00a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:35:59 2017 -0500 Merge branch 'bug22895_027' into maint-0.2.9 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 6059784be0b022adbe274035acc920381ca3fef0 Merge: 985c41b50 1d5e693b6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd Merge: 562b3c967 50fbede45 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.3.1] Remove unused variables in donna's SSE2 code
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Wed Jul 12 16:33:01 2017 +0000 Remove unused variables in donna's SSE2 code Fixes unused-const-variable warnings with GCC on 32-bit x86 systems. Closes #22895. --- changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/changes/ticket22895 b/changes/ticket22895 new file mode 100644 index 000000000..a3f7b8601 --- /dev/null +++ b/changes/ticket22895 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - Fix unused variable warnings in donna's Curve25519 SSE2 code. + Fixes bug 22895; bugfix on 0.2.7.2-alpha. diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h b/src/ext/ed25519/donna/curve25519-donna-sse2.h index 1dbfd44d8..1123cb1e9 100644 --- a/src/ext/ed25519/donna/curve25519-donna-sse2.h +++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h @@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5]; typedef packedelem64 packed64bignum25519[10]; static const packedelem32 bot32bitmask = {{0xffffffff, 0x00000000, 0xffffffff, 0x00000000}}; -static const packedelem32 top32bitmask = {{0x00000000, 0xffffffff, 0x00000000, 0xffffffff}}; static const packedelem32 top64bitmask = {{0x00000000, 0x00000000, 0xffffffff, 0xffffffff}}; static const packedelem32 bot64bitmask = {{0xffffffff, 0xffffffff, 0x00000000, 0x00000000}}; /* reduction masks */ static const packedelem64 packedmask26 = {{0x03ffffff, 0x03ffffff}}; static const packedelem64 packedmask25 = {{0x01ffffff, 0x01ffffff}}; -static const packedelem32 packedmask2625 = {{0x3ffffff,0,0x1ffffff,0}}; static const packedelem32 packedmask26262626 = {{0x03ffffff, 0x03ffffff, 0x03ffffff, 0x03ffffff}}; static const packedelem32 packedmask25252525 = {{0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff}}; /* multipliers */ static const packedelem64 packednineteen = {{19, 19}}; -static const packedelem64 packednineteenone = {{19, 1}}; static const packedelem64 packedthirtyeight = {{38, 38}}; static const packedelem64 packed3819 = {{19*2,19}}; -static const packedelem64 packed9638 = {{19*4,19*2}}; - -/* 121666,121665 */ -static const packedelem64 packed121666121665 = {{121666, 121665}}; /* 2*(2^255 - 19) = 0 mod p */ static const packedelem32 packed2p0 = {{0x7ffffda,0x3fffffe,0x7fffffe,0x3fffffe}};

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 50fbede4597d143411b3739e88d2c3d8ef457fbd Merge: fea5c8a01 1b9bb2c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 50fbede4597d143411b3739e88d2c3d8ef457fbd Merge: fea5c8a01 1b9bb2c84 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:36:04 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'bug22895_027' into maint-0.2.9
by nickm＠torproject.org 14 Nov '17

14 Nov '17

commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c Merge: 543fd89fb 89c0a00a9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 20:35:59 2017 -0500 Merge branch 'bug22895_027' into maint-0.2.9 changes/ticket22895 | 3 +++ src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-)

1 0