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

[tor/master] Add branch prediction to util_bug.h, and fix a bug.
by nickm＠torproject.org 15 Apr '16

15 Apr '16

commit 381dae43b6ecd5134820cd8212c71a6d7a56c36d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 15 09:12:03 2016 -0400 Add branch prediction to util_bug.h, and fix a bug. --- src/common/util_bug.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/util_bug.h b/src/common/util_bug.h index 2613450..36056aa 100644 --- a/src/common/util_bug.h +++ b/src/common/util_bug.h @@ -64,7 +64,7 @@ #define tor_assert_nonfatal_unreached_once(… [View More]) tor_assert(0) #define tor_assert_nonfatal_once(cond) tor_assert((cond)) #define BUG(cond) \ - ((cond) ? \ + (PREDICT_UNLIKELY(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,#cond), abort(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) @@ -72,7 +72,7 @@ #define tor_assert_nonfatal(cond) ((void)(cond)) #define tor_assert_nonfatal_unreached_once() STMT_NIL #define tor_assert_nonfatal_once(cond) ((void)(cond)) -#define BUG(cond) ((cond) ? 1 : 0) +#define BUG(cond) (PREDICT_UNLIKELY(cond) ? 1 : 0) #else /* Normal case, !ALL_BUGS_ARE_FATAL, !DISABLE_ASSERTS_IN_UNIT_TESTS */ #define tor_assert_nonfatal_unreached() STMT_BEGIN \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, NULL, 0); \ @@ -97,7 +97,7 @@ } \ STMT_END #define BUG(cond) \ - ((cond) ? \ + (PREDICT_UNLIKELY(cond) ? \ (tor_bug_occurred_(SHORT_FILE__,__LINE__,__func__,#cond,0), 1) \ : 0) #endif @@ -107,15 +107,15 @@ if (({ \ static int var = 0; \ int bool_result = (cond); \ - if (bool_result && !var) { \ + if (PREDICT_UNLIKELY(bool_result) && !var) { \ var = 1; \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1); \ } \ - var; })) + PREDICT_UNLIKELY(bool_result); })) #else #define IF_BUG_ONCE__(cond,var) \ static int var = 0; \ - if ((cond) ? \ + if (PREDICT_UNLIKELY(cond)) ? \ (var ? 1 : \ (var=1, \ tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1), \ [View Less]

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 7578630eb759549ec5ad64d58dc033d450c7b392 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:46:48 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- zh_HK/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_HK/irc.properties b/zh_HK/irc.properties index 9350c4d..1f7fe19 100644 --- a/zh_HK/irc.properties +++ b/zh_HK/irc.properties @@ -122,7 +122,7 @@ message.summoned=召喚%S。 # %… [View More]

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit a850d54fc973ebc424113ff4ecd146edaa778205 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:46:44 2016 +0000 Update translations for tor-messenger-ircproperties --- zh_HK/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_HK/irc.properties b/zh_HK/irc.properties index 9350c4d..1f7fe19 100644 --- a/zh_HK/irc.properties +++ b/zh_HK/irc.properties @@ -122,7 +122,7 @@ message.summoned=召喚%S。 # %S is the … [View More]

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 1b6eeb87440ac7a9cfd25a845219102f73821a0b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:45:36 2016 +0000 Update translations for tails-greeter_completed --- zh_HK/zh_HK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index 3107a94..7ccb00c 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "… [View More]

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit f824a09b063965322df72cad0ed6194b44c467fc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:45:33 2016 +0000 Update translations for tails-greeter --- zh_HK/zh_HK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index 3107a94..7ccb00c 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-… [View More]

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 75872edc3d94ce750586d0c560f9a3a6eb441281 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:45:27 2016 +0000 Update translations for liveusb-creator_completed --- zh_HK/zh_HK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index f97ffa7..ba90806 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" … [View More]

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 1ce0cc2307ce3ade224974b9889052f708dc0fc2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:45:24 2016 +0000 Update translations for liveusb-creator --- zh_HK/zh_HK.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po index f97ffa7..ba90806 100644 --- a/zh_HK/zh_HK.po +++ b/zh_HK/zh_HK.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-… [View More]

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit ffb574c4cc5d8ad62c0ed6adb904e1e86cf95972 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:45:07 2016 +0000 Update translations for bridgedb_completed --- zh_HK/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 37320a3..f7d825e 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "… [View More]

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit 9676abe84d23fd40c8c60f6fc94ee34a5ab9f914 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:45:04 2016 +0000 Update translations for bridgedb --- zh_HK/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po index 37320a3..f7d825e 100644 --- a/zh_HK/LC_MESSAGES/bridgedb.po +++ b/zh_HK/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-… [View More]

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 15 Apr '16

15 Apr '16

commit e0c7be00da4b0ae976e76531e1ddac2996003c3e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Apr 15 03:16:15 2016 +0000 Update translations for torbutton-torbuttondtd --- zh_HK/torbutton.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_HK/torbutton.dtd b/zh_HK/torbutton.dtd index 1ba4b72..40696a7 100644 --- a/zh_HK/torbutton.dtd +++ b/zh_HK/torbutton.dtd @@ -86,16 +86,16 @@ <!ENTITY torbutton.prefs.non_tor "非Tor洋蔥路由"… [View More]> <!ENTITY torbutton.prefs.restore_tor "啟動還原工作階段時，將Tor洋蔥路由狀態設定成："> <!ENTITY torbutton.prefs.startup_tor "啟動瀏覽器時，將Tor洋蔥路由狀態設定成："> -<!ENTITY torbutton.prefs.reload_crashed_jar "Reload cookie jar/clear cookies on Firefox crash (recommended)"> +<!ENTITY torbutton.prefs.reload_crashed_jar "Firefox撞毁時重新載入Jar╱清理Cookies (建議)"> <!ENTITY torbutton.prefs.dual_cookie_jars "將Tor洋蔥路由同非Tor洋蔥路由嘅Cookie同時存放喺受保護嘅Jar內(危險)"> <!ENTITY torbutton.prefs.clear_http_auth "清除http驗證工作階段(建議)"> <!ENTITY torbutton.prefs.block_js_history "隔離瀏覽歷程記錄嘅存取到Tor洋蔥路由狀態(重要)"> <!ENTITY torbutton.prefs.resize_on_toggle "調整視窗尺寸成50像素嘅倍數(建議)"> <!ENTITY torbutton.prefs.close_tor "切換時，關閉全部Tor洋蔥路由視窗同分頁(選用)"> -<!ENTITY torbutton.prefs.close_nontor "切換時，全部非Tor洋蔥路由視窗同分頁(選用)"> +<!ENTITY torbutton.prefs.close_nontor "切換時，關閉全部非Tor洋蔥路由視窗同分頁(選用)"> <!ENTITY torbutton.prefs.block_links "喺唔同嘅Tor洋蔥路由狀態，阻止撳落連結同頁面重新載入(選用)"> -<!ENTITY torbutton.prefs.jar_certs "對於Tor洋蔥路由╱非Tor洋蔥路由將SSL憑證存放於獨立嘅Jar內(建議)"> -<!ENTITY torbutton.prefs.jar_ca_certs "對於Tor洋蔥路由╱非Tor洋蔥路由將CA憑證存放於獨立嘅Jar內(建議)"> +<!ENTITY torbutton.prefs.jar_certs "將Tor洋蔥路由和非Tor洋蔥路嘅SSL憑證分開Jar嚟存放(建議)"> +<!ENTITY torbutton.prefs.jar_ca_certs "將Tor洋蔥路由和非Tor洋蔥路嘅CA憑證分開Jar嚟存放(建議)"> <!ENTITY torbutton.prefs.locked_mode "停用按鈕同快速鍵，以防止切換"> <!ENTITY torbutton.prefs.startup_state "正常啟動時，將Tor洋蔥路由狀態設定成："> <!ENTITY torbutton.prefs.shutdown_state "關閉狀態"> [View Less]

1 0