- tor-commits - lists.torproject.org

[tpo/staging] add more locales to alphas
by emmapeel＠torproject.org 26 Mar '19

26 Mar '19

commit d163d1231fb94d518ac8ee7ae721e4678ab79b67 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:55:53 2019 +0100 add more locales to alphas --- databags/download-alternatives-alpha.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index c79e32a..d13d584 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -10,6 +10,10 @@ language = عربية (ar) url = /ca/ language = Catalá (ca) +[cs] +url = /cs/ +language = Čeština (cs) + [da] url = /da/ language = Dansk (da) @@ -18,6 +22,10 @@ language = Dansk (da) url = /de/ language = Deutsch (de) +[el] +url = /el/ +language = ελληνικά (el) + [es-ES] url = /es/ language = Español (es) @@ -38,6 +46,10 @@ language = Gaeilge (ga) url = /he/ language = עברית (he) +[hu] +url = /hu/ +language = Magyar (hu) + [id] url = /id/ language = Indonesia (id) @@ -54,6 +66,10 @@ language = Italiano (it) url = /ja/ language = 日本語 (ja) +[ka] +url = /ka/ +language = ქართული ენა (ka) + [ko] url = /ko/ language = 한국어 (ko)

1 0

[tpo/staging] typo
by emmapeel＠torproject.org 26 Mar '19

26 Mar '19

commit a5419f125178b358b2c183abf31e38d7ed594e00 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:56:12 2019 +0100 typo --- databags/download-alternatives-alpha.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 2fdf984..c79e32a 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -78,9 +78,9 @@ language = Português Brasil(pt-BR) language = Русский (ru) url = /ru/ -[sv] -url = /sv/ -language = Svenska (sv) +[sv-SE] +url = /sv-SE/ +language = Svenska (sv-SE) [tr] url = /tr/

1 0

[tpo/master] typo
by emmapeel＠torproject.org 26 Mar '19

26 Mar '19

commit c1a4772794a757f85800c84b26c74bc51072fd42 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:56:12 2019 +0100 typo --- databags/download-alternatives-alpha.ini | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 16bc34d..d13d584 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -94,9 +94,9 @@ language = Português Brasil(pt-BR) language = Русский (ru) url = /ru/ -[sv] -url = /sv/ -language = Svenska (sv) +[sv-SE] +url = /sv-SE/ +language = Svenska (sv-SE) [tr] url = /tr/

1 0

[tpo/master] add more locales to alphas
by emmapeel＠torproject.org 26 Mar '19

26 Mar '19

commit 838619bc239664d3434e6582979952f601f037ad Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:55:53 2019 +0100 add more locales to alphas --- databags/download-alternatives-alpha.ini | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 2fdf984..16bc34d 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -10,6 +10,10 @@ language = عربية (ar) url = /ca/ language = Catalá (ca) +[cs] +url = /cs/ +language = Čeština (cs) + [da] url = /da/ language = Dansk (da) @@ -18,6 +22,10 @@ language = Dansk (da) url = /de/ language = Deutsch (de) +[el] +url = /el/ +language = ελληνικά (el) + [es-ES] url = /es/ language = Español (es) @@ -38,6 +46,10 @@ language = Gaeilge (ga) url = /he/ language = עברית (he) +[hu] +url = /hu/ +language = Magyar (hu) + [id] url = /id/ language = Indonesia (id) @@ -54,6 +66,10 @@ language = Italiano (it) url = /ja/ language = 日本語 (ja) +[ka] +url = /ka/ +language = ქართული ენა (ka) + [ko] url = /ko/ language = 한국어 (ko)

1 0

[tpo/master] remove incomplete languages
by emmapeel＠torproject.org 26 Mar '19

26 Mar '19

commit 92e0b1fac90fb1b22a1da7026ad2f87d446ab00b Author: emma peel <emma.peel(a)riseup.net> Date: Tue Mar 26 10:54:41 2019 +0100 remove incomplete languages --- configs/i18n.ini | 2 +- databags/alternatives.ini | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 533d593..04dbd31 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = bn-BD,de,es,fr,id,it,pt-BR,ru,tr,zh-CN +translations = de,es,fr,it,pt-BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = 'https://lektor-staging.torproject.org/tpo/staging/' diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 149d345..035c0c9 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,12 +4,6 @@ order = order-last url = / language = English (en) -[bn-BD] -direction = text-left -order = order-last -url = /bn-BD/ -language = বাংলা ভাষা (bn-BD) - [de] direction = text-left order = order-last @@ -28,12 +22,6 @@ order = order-last url = /fr/ language = Français (fr) -[id] -direction = text-left -order = order-last -url = /id/ -language = Indonesia (id) - [it] direction = text-left order = order-last @@ -51,15 +39,3 @@ direction = text-left order = order-last url = /ru/ language = Русский (ru) - -[tr] -direction = text-left -order = order-last -url = /tr/ -language = Türkçe (tr) - -[zh-CN] -direction = text-left -order = order-last -url = /zh-CN/ -language = 简体字 (zh-CN)

1 0

[tor-browser-build/maint-8.0] Bump NoScript version to 10.2.5
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit a9c6707fcf44fa22e7e9cd806b3d3b11677e87ae Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:44:50 2019 +0000 Bump NoScript version to 10.2.5 Fixes bug 29872 (XSS popup with DuckDuckGo search on about:tor) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 4375835..c0f5123 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -71,9 +71,9 @@ input_files: name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 9f55becde2330348c8354bac12ce295dc1e5838f6fc61614a476c7785f5d43f4 + sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[tor-browser-build/master] Bump NoScript version to 10.2.5
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit aac31f8aa81a76cd33e0bfd1de2294db4ee79c1c Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:44:50 2019 +0000 Bump NoScript version to 10.2.5 Fixes bug 29872 (XSS popup with DuckDuckGo search on about:tor) --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1d76492..22d99c6 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -92,9 +92,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 9f55becde2330348c8354bac12ce295dc1e5838f6fc61614a476c7785f5d43f4 + sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop'

1 0

[torbutton/master] Fold in stable Changelog
by gk＠torproject.org 26 Mar '19

26 Mar '19

commit 674785b42a87c25d3a08ee0f22aeb17a02cf50e8 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 26 09:40:48 2019 +0000 Fold in stable Changelog --- src/CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index a138a9aa..01150a54 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -7,6 +7,9 @@ * Bug 29239: Don't ship the Torbutton .xpi on mobile * Translations update +2.0.11 + * Bug 29021: Tell NoScript it is running within Tor Browser + 2.1.4 * Bug 25702: Update Tor Browser icon to follow design guidelines * Bug 21805: Add click-to-play button for WebGL

1 0

[tor/master] Refrain from doing exhaustive iteration over all values of integers
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 052ec08a085d69ac2ffb3475e61631b0aef26562 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Mar 12 12:01:26 2019 +0200 Refrain from doing exhaustive iteration over all values of integers --- src/test/test_ptr_slow.c | 57 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/src/test/test_ptr_slow.c b/src/test/test_ptr_slow.c index a5914c912..632a30417 100644 --- a/src/test/test_ptr_slow.c +++ b/src/test/test_ptr_slow.c @@ -10,46 +10,65 @@ #include <stdint.h> #include <limits.h> -/** Check that all values of int can be cast to void * and back. */ +/** Assert that <b>a</b> can be cast to void * and back. */ +static void +assert_int_voidptr_roundtrip(int a) +{ + intptr_t ap = (intptr_t)a; + void *b = (void *)ap; + intptr_t c = (intptr_t)b; + void *d = (void *)c; + + tt_assert(ap == c); + tt_assert(b == d); + + done: + return; +} + static void test_int_voidstar_interop(void *arg) { int a; (void)arg; - for (a = INT_MIN; a < INT_MAX; a++) { - intptr_t ap = (intptr_t)a; - void *b = (void *)ap; - intptr_t c = (intptr_t)b; - void *d = (void *)c; + for (a = 0; a <= 1024; a++) { + assert_int_voidptr_roundtrip(a); + } - tt_assert(ap == c); - tt_assert(b == d); + for (a = INT_MAX-1024; a < INT_MAX; a++) { + assert_int_voidptr_roundtrip(a); } +} + +static void +assert_uint_voidptr_roundtrip(unsigned int a) +{ + intptr_t ap = (intptr_t)a; + void *b = (void *)ap; + intptr_t c = (intptr_t)b; + void *d = (void *)c; + + tt_assert(ap == c); + tt_assert(b == d); done: return; } -/** Check that all values of unsigned int can be cast to void * and back. */ static void test_uint_voidstar_interop(void *arg) { unsigned int a; (void)arg; - for (a = 0; a < UINT_MAX; a++) { - intptr_t ap = (intptr_t)a; - void *b = (void *)ap; - intptr_t c = (intptr_t)b; - void *d = (void *)c; - - tt_assert(ap == c); - tt_assert(b == d); + for (a = 0; a <= 1024; a++) { + assert_uint_voidptr_roundtrip(a); } - done: - return; + for (a = UINT_MAX-1024; a < UINT_MAX; a++) { + assert_uint_voidptr_roundtrip(a); + } } struct testcase_t slow_ptr_tests[] = {

1 0

[tor/master] Move casts to separate C file to prevent compiler from optimising them away
by teor＠torproject.org 26 Mar '19

26 Mar '19

commit 0bc9ed9d38cb29783d000b6e22677ae16727976b Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Wed Mar 20 18:54:11 2019 +0200 Move casts to separate C file to prevent compiler from optimising them away --- src/test/include.am | 2 ++ src/test/ptr_helpers.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ src/test/ptr_helpers.h | 18 +++++++++++++++++ src/test/test_ptr_slow.c | 13 +++++++------ 4 files changed, 77 insertions(+), 6 deletions(-) diff --git a/src/test/include.am b/src/test/include.am index e6cebe1d1..700107d6c 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -211,6 +211,7 @@ src_test_test_slow_SOURCES += \ src/test/test_crypto_slow.c \ src/test/test_process_slow.c \ src/test/test_prob_distr.c \ + src/test/ptr_helpers.c \ src/test/test_ptr_slow.c \ src/test/testing_common.c \ src/test/testing_rsakeys.c \ @@ -315,6 +316,7 @@ noinst_HEADERS+= \ src/test/log_test_helpers.h \ src/test/rend_test_helpers.h \ src/test/test.h \ + src/test/ptr_helpers.h \ src/test/test_helpers.h \ src/test/test_dir_common.h \ src/test/test_connection.h \ diff --git a/src/test/ptr_helpers.c b/src/test/ptr_helpers.c new file mode 100644 index 000000000..296238fee --- /dev/null +++ b/src/test/ptr_helpers.c @@ -0,0 +1,50 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "ptr_helpers.h" + +/** + * Cast <b> (inptr_t value) to a void pointer. + */ +void * +cast_intptr_to_voidstar(intptr_t x) +{ + void *r = (void *)x; + + return r; +} + +/** + * Cast x (void pointer) to inptr_t value. + */ +intptr_t +cast_voidstar_to_intptr(void *x) +{ + intptr_t r = (intptr_t)x; + + return r; +} + +/** + * Cast x (uinptr_t value) to void pointer. + */ +void * +cast_uintptr_to_voidstar(uintptr_t x) +{ + void *r = (void *)x; + + return r; +} + +/** + * Cast x (void pointer) to uinptr_t value. + */ +uintptr_t +cast_voidstar_to_uintptr(void *x) +{ + uintptr_t r = (uintptr_t)x; + + return r; +} diff --git a/src/test/ptr_helpers.h b/src/test/ptr_helpers.h new file mode 100644 index 000000000..fe2c8c970 --- /dev/null +++ b/src/test/ptr_helpers.h @@ -0,0 +1,18 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2019, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include <stdint.h> + +void * +cast_intptr_to_voidstar(intptr_t x); + +intptr_t +cast_voidstar_to_intptr(void *x); + +void * +cast_uintptr_to_voidstar(uintptr_t x); + +uintptr_t +cast_voidstar_to_uintptr(void *x); diff --git a/src/test/test_ptr_slow.c b/src/test/test_ptr_slow.c index f064a3e7c..07481fb1e 100644 --- a/src/test/test_ptr_slow.c +++ b/src/test/test_ptr_slow.c @@ -6,6 +6,7 @@ #include "orconfig.h" #include "core/or/or.h" #include "test/test.h" +#include "test/ptr_helpers.h" #include <stdint.h> #include <limits.h> @@ -15,9 +16,9 @@ static void assert_int_voidptr_roundtrip(int a) { intptr_t ap = (intptr_t)a; - void *b = (void *)ap; - intptr_t c = (intptr_t)b; - void *d = (void *)c; + void *b = cast_intptr_to_voidstar(ap); + intptr_t c = cast_voidstar_to_intptr(b); + void *d = cast_intptr_to_voidstar(c); tt_assert(ap == c); tt_assert(b == d); @@ -45,9 +46,9 @@ static void assert_uint_voidptr_roundtrip(unsigned int a) { uintptr_t ap = (uintptr_t)a; - void *b = (void *)ap; - uintptr_t c = (uintptr_t)b; - void *d = (void *)c; + void *b = cast_uintptr_to_voidstar(ap); + uintptr_t c = cast_voidstar_to_uintptr(b); + void *d = cast_uintptr_to_voidstar(c); tt_assert(ap == c); tt_assert(b == d);

1 0