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

[tor/maint-0.2.9] 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.0] 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.2.9] 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.0] 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.0] 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

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

14 Nov '17

commit 3ff2ab729c9225dca9f253b6f86da642ab583078 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 01:17:03 2017 +0000 Update translations for tor-launcher-network-settings --- nb/network-settings.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 2824aa648..0294ffa79 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Nettverksinnstillinger for Tor"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> +<!ENTITY torsettings.wizard.title.default "Koble til Tor"> <!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> +<!ENTITY torsettings.wizard.title.connecting "Etablering av tilkobling">  <!ENTITY torlauncher.localePicker.title "Språk i Tor-nettleseren"> @@ -9,7 +9,7 @@  -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> +<!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.configure "Sett opp"> <!ENTITY torSettings.connect "Koble til"> @@ -27,7 +27,7 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> <!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> +<!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype"> <!ENTITY torsettings.useProxy.address "Adresse:"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -38,16 +38,16 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter"> <!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a built-in bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> +<!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land"> +<!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsårer"> +<!ENTITY torsettings.useBridges.default.placeholder "velg en bro"> +<!ENTITY torsettings.useBridges.custom "Tilby en bro jeg kjenner"> +<!ENTITY torsettings.useBridges.label "Skriv inn broinformasjon fra en betrodd kilde."> <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> <!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen"> -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> +<!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.bridgeHelpTitle "Hjelp med Bro-rutingsstafettoppsett">

1 0

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

14 Nov '17

commit db0bf69640a1242cd7a364855bf46a2b3b4e5940 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 01:16:47 2017 +0000 Update translations for tor-launcher-properties_completed --- nb/torlauncher.properties | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index 0bb82b1b0..acde34bc7 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -23,12 +23,13 @@ torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S torlauncher.ensure_tor_is_running=Sjekk at Tor kjører. torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å sette opp Tor til bruk med en mellomtjener for å koble til Internett. -torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen +torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen. torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. -torlauncher.recommended_bridge=(anbefalt) +torlauncher.bridge_suffix.meek-amazon=(virker i Kina) +torlauncher.bridge_suffix.meek-azure=(virker i Kina) torlauncher.connect=Koble til torlauncher.restart_tor=Omstart av Tor

1 0

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

14 Nov '17

commit 68837e4bdd9a33a51d43a9016689822e944e8d56 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 14 01:16:40 2017 +0000 Update translations for tor-launcher-properties --- nb/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index adefc26ed..acde34bc7 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -23,13 +23,13 @@ torlauncher.failed_to_save_settings=Kunne ikke lagre Tor-innstillinger.\n\n%S torlauncher.ensure_tor_is_running=Sjekk at Tor kjører. torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å sette opp Tor til bruk med en mellomtjener for å koble til Internett. -torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen +torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen. torlauncher.error_bridges_missing=Du må velge én eller flere broer. torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype for de angitte broene. torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har tilkoblingstypen %S tilgjengelig. Juster innstillingene dine. -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) +torlauncher.bridge_suffix.meek-amazon=(virker i Kina) +torlauncher.bridge_suffix.meek-azure=(virker i Kina) torlauncher.connect=Koble til torlauncher.restart_tor=Omstart av Tor

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 5a9b0374a0cacc5bd8424efaae6e3139419818e8 Merge: a5a87c1d9 985c41b50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 16:58:21 2017 -0500 Merge branch 'maint-0.3.2'

1 0

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

13 Nov '17

commit 8473424ede44053f3986330b5f80c36ff12e3162 Merge: ab8013391 985c41b50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 16:58:21 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket23637 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0