July 2016 - tor-commits - lists.torproject.org

[tor/master] Avoid infinite stack explosion in windows monotime.
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 9c210d0e81016b493f1759141ddcbfeda7d5b5f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 15:26:05 2016 +0200 Avoid infinite stack explosion in windows monotime. [init calls get calls init calls get calls init.... ] --- src/common/compat_time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index cc2c3c8..77fdfc8 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -536,12 +536,12 @@ void monotime_init(void) { if (!monotime_initialized) { + monotime_initialized = 1; monotime_init_internal(); monotime_get(&initialized_at); #ifdef MONOTIME_COARSE_FN_IS_DIFFERENT monotime_coarse_get(&initialized_at_coarse); #endif - monotime_initialized = 1; } }

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit 55e85c2233d4cc719c43068e5c3ea25230bcf95d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 13:15:35 2016 +0000 Update translations for https_everywhere_completed --- ro/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index 91d24d2..3def977 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "Preferințele pentru Observatorul SSL"> <!ENTITY https-everywhere.menu.globalEnable "Activează HTTPS Oriunde"> <!ENTITY https-everywhere.menu.globalDisable "Dezactivează HTTPS Oriunde"> -<!ENTITY https-everywhere.menu.blockHttpRequests "Blochează toate cererile HTTP"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blochează toate cererile necriptate"> <!ENTITY https-everywhere.menu.showCounter "Afișează contorul"> <!ENTITY https-everywhere.menu.viewAllRules "Vezi toate regulile">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit e60c5221da7ac24fbc2aea5d80168ab8b1bcc1cf Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 13:15:26 2016 +0000 Update translations for https_everywhere --- ro/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd index 50cd4f1..3def977 100644 --- a/ro/https-everywhere.dtd +++ b/ro/https-everywhere.dtd @@ -20,7 +20,7 @@ <!ENTITY https-everywhere.menu.observatory "Preferințele pentru Observatorul SSL"> <!ENTITY https-everywhere.menu.globalEnable "Activează HTTPS Oriunde"> <!ENTITY https-everywhere.menu.globalDisable "Dezactivează HTTPS Oriunde"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Blochează toate cererile necriptate"> <!ENTITY https-everywhere.menu.showCounter "Afișează contorul"> <!ENTITY https-everywhere.menu.viewAllRules "Vezi toate regulile">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 21 Jul '16

21 Jul '16

commit 576dbacb3b4c34c6dfc073d485d4ea81d5668610 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jul 21 12:45:04 2016 +0000 Update translations for bridgedb --- la/LC_MESSAGES/bridgedb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/la/LC_MESSAGES/bridgedb.po b/la/LC_MESSAGES/bridgedb.po index 8553d1b..656f144 100644 --- a/la/LC_MESSAGES/bridgedb.po +++ b/la/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-20 19:26+0000\n" +"PO-Revision-Date: 2016-07-21 12:42+0000\n" "Last-Translator: Alisa P <parashchenko.alisa(a)yandex.com>\n" "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Aliquid in rogatione tua falsum erat." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" @@ -251,7 +251,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "Quid sunt pontes?" #: bridgedb/strings.py:102 #, python-format

1 0

[tor/master] Once more, 32-bit fixes on monotime mocking
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 1d0775684d3faa0826f7a51f17f6e3442777e313 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 14:32:15 2016 +0200 Once more, 32-bit fixes on monotime mocking --- src/common/compat_time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 011bc9e..cc2c3c8 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -347,8 +347,8 @@ monotime_coarse_get(monotime_coarse_t *out) { #ifdef TOR_UNIT_TESTS if (monotime_mocking_enabled) { - out->ts_.tv_sec = mock_time_nsec_coarse / ONE_BILLION; - out->ts_.tv_nsec = mock_time_nsec_coarse % ONE_BILLION; + out->ts_.tv_sec = (time_t) (mock_time_nsec_coarse / ONE_BILLION); + out->ts_.tv_nsec = (int) (mock_time_nsec_coarse % ONE_BILLION); return; } #endif

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 9c87869dde2fdae5ef624700a567c6ffc1e964c8 Merge: 22314f9 f1973e7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 14:15:19 2016 +0200 Merge branch 'maint-0.2.8' src/common/sandbox.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/master] Coverity hates it when we do "E1 ? E2 : E2".
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit f1973e70a45d9705d3bd547af9cee92ca3611213 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 14:14:33 2016 +0200 Coverity hates it when we do "E1 ? E2 : E2". It says, 'Incorrect expression (IDENTICAL_BRANCHES)' Fix for CID 1364127. Not in any released Tor. --- src/common/sandbox.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 56a1cff..74187e5 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -608,7 +608,6 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) const int pf = i ? PF_INET : PF_INET6; for (j=0; j < 3; ++j) { const int type = (j == 0) ? SOCK_STREAM : - (j == 1) ? SOCK_DGRAM : SOCK_DGRAM; const int protocol = (j == 0) ? IPPROTO_TCP : (j == 1) ? IPPROTO_IP :

1 0

[tor/maint-0.2.8] Coverity hates it when we do "E1 ? E2 : E2".
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit f1973e70a45d9705d3bd547af9cee92ca3611213 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 14:14:33 2016 +0200 Coverity hates it when we do "E1 ? E2 : E2". It says, 'Incorrect expression (IDENTICAL_BRANCHES)' Fix for CID 1364127. Not in any released Tor. --- src/common/sandbox.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 56a1cff..74187e5 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -608,7 +608,6 @@ sb_socket(scmp_filter_ctx ctx, sandbox_cfg_t *filter) const int pf = i ? PF_INET : PF_INET6; for (j=0; j < 3; ++j) { const int type = (j == 0) ? SOCK_STREAM : - (j == 1) ? SOCK_DGRAM : SOCK_DGRAM; const int protocol = (j == 0) ? IPPROTO_TCP : (j == 1) ? IPPROTO_IP :

1 0

[tor/master] loony mingwcross bug: insist we dont have clock_gettime.
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 22314f9050851ddebd29bd63085d83f4fa5ba926 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 14:09:00 2016 +0200 loony mingwcross bug: insist we dont have clock_gettime. --- src/common/compat_time.c | 1 + src/common/compat_time.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 5891682..011bc9e 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -13,6 +13,7 @@ #include "compat.h" #ifdef _WIN32 +#undef HAVE_CLOCK_GETTIME #include <winsock2.h> #include <windows.h> #endif diff --git a/src/common/compat_time.h b/src/common/compat_time.h index de6994f..2262446 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -19,6 +19,9 @@ #define TOR_COMPAT_TIME_H #include "orconfig.h" +#ifdef _WIN32 +#undef HAVE_CLOCK_GETTIME +#endif #if defined(HAVE_CLOCK_GETTIME) /* to ensure definition of CLOCK_MONOTONIC_COARSE if it's there */

1 0

[tor/master] fix monotime test mocking on 32-bit systems
by nickm＠torproject.org 21 Jul '16

21 Jul '16

commit 852cff043b6f6561beb8021f3e8a05a327482d9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 21 14:05:29 2016 +0200 fix monotime test mocking on 32-bit systems --- src/common/compat_time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 52abfeb..5891682 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -331,8 +331,8 @@ monotime_get(monotime_t *out) { #ifdef TOR_UNIT_TESTS if (monotime_mocking_enabled) { - out->ts_.tv_sec = mock_time_nsec / ONE_BILLION; - out->ts_.tv_nsec = mock_time_nsec % ONE_BILLION; + out->ts_.tv_sec = (time_t) (mock_time_nsec / ONE_BILLION); + out->ts_.tv_nsec = (int) (mock_time_nsec % ONE_BILLION); return; } #endif

1 0