June 2018 - tor-commits - lists.torproject.org

[tor/master] fixup! Extract core part of smartlist code into its own library.
by nickm＠torproject.org 27 Jun '18

27 Jun '18

commit 6e2b6a6685b303dbcc920f4019823448127a5284 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 12:18:49 2018 -0400 fixup! Extract core part of smartlist code into its own library. --- src/rust/build.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/build.rs b/src/rust/build.rs index b43fbdceb..5be093bf8 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -155,6 +155,7 @@ pub fn main() { cfg.component("tor-lock"); cfg.component("tor-fdio"); cfg.component("tor-container-testing"); + cfg.component("tor-smartlist-core-testing"); cfg.component("tor-string-testing"); cfg.component("tor-malloc"); cfg.component("tor-wallclock");

1 0

[tor/master] Merge branch 'ticket26494'
by nickm＠torproject.org 27 Jun '18

27 Jun '18

commit 300e3bebd19b2686501d5400da1ca4a748027ba4 Merge: 0742b3872 82a7343b0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 27 12:47:08 2018 -0400 Merge branch 'ticket26494' .gitignore | 2 + Makefile.am | 6 +- src/include.am | 1 + src/lib/container/.may_include | 1 + src/lib/container/smartlist.c | 290 ----------------------------- src/lib/container/smartlist.h | 207 +------------------- src/lib/log/.may_include | 2 +- src/lib/log/torlog.c | 6 +- src/lib/log/util_bug.c | 3 +- src/lib/smartlist_core/.may_include | 7 + src/lib/smartlist_core/include.am | 21 +++ src/lib/smartlist_core/smartlist_core.c | 234 +++++++++++++++++++++++ src/lib/smartlist_core/smartlist_core.h | 95 ++++++++++ src/lib/smartlist_core/smartlist_foreach.h | 128 +++++++++++++ src/lib/smartlist_core/smartlist_split.c | 87 +++++++++ src/lib/smartlist_core/smartlist_split.h | 15 ++ src/rust/build.rs | 1 + 17 files changed, 606 insertions(+), 500 deletions(-)

1 0

[tor/master] Use raw_assert directly in smartlist_core
by nickm＠torproject.org 27 Jun '18

27 Jun '18

commit d7bd8cf3b6d70f3014bb1140d0d018f94fedb178 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 26 12:16:04 2018 -0400 Use raw_assert directly in smartlist_core I had previously added a "#define tor_assert raw_assert" here, to make code movement in the previous commit more clear. --- src/lib/smartlist_core/smartlist_core.c | 26 ++++++++++++-------------- src/lib/smartlist_core/smartlist_split.c | 8 +++----- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/src/lib/smartlist_core/smartlist_core.c b/src/lib/smartlist_core/smartlist_core.c index ca5c5f0bf..aefdd7709 100644 --- a/src/lib/smartlist_core/smartlist_core.c +++ b/src/lib/smartlist_core/smartlist_core.c @@ -14,8 +14,6 @@ #include "lib/malloc/util_malloc.h" #include "lib/smartlist_core/smartlist_core.h" -#define tor_assert raw_assert - #include <stdlib.h> #include <string.h> @@ -103,10 +101,10 @@ void smartlist_add_all(smartlist_t *s1, const smartlist_t *s2) { size_t new_size = (size_t)s1->num_used + (size_t)s2->num_used; - tor_assert(new_size >= (size_t) s1->num_used); /* check for overflow. */ + raw_assert(new_size >= (size_t) s1->num_used); /* check for overflow. */ smartlist_ensure_capacity(s1, new_size); memcpy(s1->list + s1->num_used, s2->list, s2->num_used*sizeof(void*)); - tor_assert(new_size <= INT_MAX); /* redundant. */ + raw_assert(new_size <= INT_MAX); /* redundant. */ s1->num_used = (int) new_size; } @@ -162,7 +160,7 @@ smartlist_remove_keeporder(smartlist_t *sl, const void *element) void * smartlist_pop_last(smartlist_t *sl) { - tor_assert(sl); + raw_assert(sl); if (sl->num_used) { void *tmp = sl->list[--sl->num_used]; sl->list[sl->num_used] = NULL; @@ -190,9 +188,9 @@ smartlist_contains(const smartlist_t *sl, const void *element) void smartlist_del(smartlist_t *sl, int idx) { - tor_assert(sl); - tor_assert(idx>=0); - tor_assert(idx < sl->num_used); + raw_assert(sl); + raw_assert(idx>=0); + raw_assert(idx < sl->num_used); sl->list[idx] = sl->list[--sl->num_used]; sl->list[sl->num_used] = NULL; } @@ -204,9 +202,9 @@ smartlist_del(smartlist_t *sl, int idx) void smartlist_del_keeporder(smartlist_t *sl, int idx) { - tor_assert(sl); - tor_assert(idx>=0); - tor_assert(idx < sl->num_used); + raw_assert(sl); + raw_assert(idx>=0); + raw_assert(idx < sl->num_used); --sl->num_used; if (idx < sl->num_used) memmove(sl->list+idx, sl->list+idx+1, sizeof(void*)*(sl->num_used-idx)); @@ -220,9 +218,9 @@ smartlist_del_keeporder(smartlist_t *sl, int idx) void smartlist_insert(smartlist_t *sl, int idx, void *val) { - tor_assert(sl); - tor_assert(idx>=0); - tor_assert(idx <= sl->num_used); + raw_assert(sl); + raw_assert(idx>=0); + raw_assert(idx <= sl->num_used); if (idx == sl->num_used) { smartlist_add(sl, val); } else { diff --git a/src/lib/smartlist_core/smartlist_split.c b/src/lib/smartlist_core/smartlist_split.c index e24a742c2..b9340e792 100644 --- a/src/lib/smartlist_core/smartlist_split.c +++ b/src/lib/smartlist_core/smartlist_split.c @@ -13,8 +13,6 @@ #include <string.h> -#define tor_assert raw_assert - /** * Split a string <b>str</b> along all occurrences of <b>sep</b>, * appending the (newly allocated) split strings, in order, to @@ -37,8 +35,8 @@ smartlist_split_string(smartlist_t *sl, const char *str, const char *sep, const char *cp, *end, *next; int n = 0; - tor_assert(sl); - tor_assert(str); + raw_assert(sl); + raw_assert(str); cp = str; while (1) { @@ -57,7 +55,7 @@ smartlist_split_string(smartlist_t *sl, const char *str, const char *sep, ; } - tor_assert(end); + raw_assert(end); if (!*end) { next = NULL;

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit 66dc866fda0e75c4f65528ed34cf92cae3dba639 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:45:25 2018 +0000 Update translations for whisperback_completed --- bn_BD/bn_BD.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po index c5406974a..6f645f674 100644 --- a/bn_BD/bn_BD.po +++ b/bn_BD/bn_BD.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Al Shahrior <shahrior3814(a)gmail.com>, 2017 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2018 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-11-18 19:38+0000\n" -"Last-Translator: Al Shahrior <shahrior3814(a)gmail.com>\n" +"PO-Revision-Date: 2018-06-27 16:45+0000\n" +"Last-Translator: Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +88,7 @@ msgstr "সার্ভারের সাথে সংযোগ স্থাপ #: ../whisperBack/gui.py:257 msgid "Unable to create or to send the mail." -msgstr "তৈরি করতে বা মেল পাঠাতে অক্ষম" +msgstr "মেল তৈরি করতে বা পাঠাতে অক্ষম।" #: ../whisperBack/gui.py:260 msgid ""

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit b418f07a679b26be5b78d865f4e5f70d6e69145d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:45:20 2018 +0000 Update translations for whisperback --- bn_BD/bn_BD.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bn_BD/bn_BD.po b/bn_BD/bn_BD.po index c5406974a..6f645f674 100644 --- a/bn_BD/bn_BD.po +++ b/bn_BD/bn_BD.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Al Shahrior <shahrior3814(a)gmail.com>, 2017 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2018 +# Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>, 2017 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-11-18 19:38+0000\n" -"Last-Translator: Al Shahrior <shahrior3814(a)gmail.com>\n" +"PO-Revision-Date: 2018-06-27 16:45+0000\n" +"Last-Translator: Al Shahrior Hasan Sagor <shahrior3814(a)gmail.com>\n" "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/otf/torproject/language/bn_BD/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +88,7 @@ msgstr "সার্ভারের সাথে সংযোগ স্থাপ #: ../whisperBack/gui.py:257 msgid "Unable to create or to send the mail." -msgstr "তৈরি করতে বা মেল পাঠাতে অক্ষম" +msgstr "মেল তৈরি করতে বা পাঠাতে অক্ষম।" #: ../whisperBack/gui.py:260 msgid ""

1 0

[translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit 49d0d2bed44dffe28c674261b5ca2b04494e1113 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:18:36 2018 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- da/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/abouttbupdate.dtd b/da/abouttbupdate.dtd index d0167c739..450e65cef 100644 --- a/da/abouttbupdate.dtd +++ b/da/abouttbupdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser-opdatering"> +<!ENTITY aboutTBUpdate.title "Opdateringer til Tor Browser"> <!ENTITY aboutTBUpdate.updated "Tor Browser er blevet opdateret."> <!ENTITY aboutTBUpdate.linkPrefix "For den mest aktuelle information om denne udgivelse,"> <!ENTITY aboutTBUpdate.linkLabel "Besøg vores webside">

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit c1cc4a2620ae41ff5f8a2518a3154c80cb4efc7b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:18:31 2018 +0000 Update translations for torbutton-abouttbupdatedtd --- da/abouttbupdate.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/abouttbupdate.dtd b/da/abouttbupdate.dtd index d0167c739..450e65cef 100644 --- a/da/abouttbupdate.dtd +++ b/da/abouttbupdate.dtd @@ -1,4 +1,4 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser-opdatering"> +<!ENTITY aboutTBUpdate.title "Opdateringer til Tor Browser"> <!ENTITY aboutTBUpdate.updated "Tor Browser er blevet opdateret."> <!ENTITY aboutTBUpdate.linkPrefix "For den mest aktuelle information om denne udgivelse,"> <!ENTITY aboutTBUpdate.linkLabel "Besøg vores webside">

1 0

[translation/torbutton-torbuttondtd_completed] Update translations for torbutton-torbuttondtd_completed
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit 233513750684f5990f3c26cfd155b8783abe0d02 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:17:36 2018 +0000 Update translations for torbutton-torbuttondtd_completed --- bn_BD/torbutton.dtd | 3 ++- da/torbutton.dtd | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd index 0e0c3a040..201f31114 100644 --- a/bn_BD/torbutton.dtd +++ b/bn_BD/torbutton.dtd @@ -47,4 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে।"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে।"> <!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও এবং ভিডিও (HTML5 মিডিয়া) ক্লিক-টু-খেলা।"> -<!ENTITY torbutton.circuit_display.title "এই সাইটের জন্য টর সার্কিট"> +<!ENTITY torbutton.circuit_display.title "টর সার্কিট"> +<!ENTITY torbutton.circuit_display.new_circuit "এই সাইটের জন্য নতুন সার্কিট"> diff --git a/da/torbutton.dtd b/da/torbutton.dtd index 7936505c0..c3f9077d4 100644 --- a/da/torbutton.dtd +++ b/da/torbutton.dtd @@ -6,7 +6,7 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-netværksindstillinger..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter Tor Browser-opdatering..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter opdateringer til Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit 312aed7f6159a5396c0c7d018672231d7a05f780 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:17:31 2018 +0000 Update translations for torbutton-torbuttondtd --- bn_BD/torbutton.dtd | 4 ++-- da/torbutton.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bn_BD/torbutton.dtd b/bn_BD/torbutton.dtd index 98b928cc8..201f31114 100644 --- a/bn_BD/torbutton.dtd +++ b/bn_BD/torbutton.dtd @@ -47,5 +47,5 @@ <!ENTITY torbutton.prefs.sec_limit_typography "কিছু ফন্ট এবং গণিত চিহ্ন অক্ষম আছে।"> <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "কিছু ফন্ট, আইকন, গণিত প্রতীক এবং ছবি অক্ষম রয়েছে।"> <!ENTITY torbutton.prefs.sec_click_to_play_media "অডিও এবং ভিডিও (HTML5 মিডিয়া) ক্লিক-টু-খেলা।"> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> +<!ENTITY torbutton.circuit_display.title "টর সার্কিট"> +<!ENTITY torbutton.circuit_display.new_circuit "এই সাইটের জন্য নতুন সার্কিট"> diff --git a/da/torbutton.dtd b/da/torbutton.dtd index 7936505c0..c3f9077d4 100644 --- a/da/torbutton.dtd +++ b/da/torbutton.dtd @@ -6,7 +6,7 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-netværksindstillinger..."> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter Tor Browser-opdatering..."> +<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter opdateringer til Tor Browser..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "O"> <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C">

1 0

[translation/torbutton-torbuttonproperties_completed] Update translations for torbutton-torbuttonproperties_completed
by translation＠torproject.org 27 Jun '18

27 Jun '18

commit 419c209c6a9762f5a89f92632fe1523ade7157ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jun 27 16:17:25 2018 +0000 Update translations for torbutton-torbuttonproperties_completed --- bn_BD/torbutton.properties | 7 +++++++ da/torbutton.properties | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bn_BD/torbutton.properties b/bn_BD/torbutton.properties index 1557e39d5..45634d878 100644 --- a/bn_BD/torbutton.properties +++ b/bn_BD/torbutton.properties @@ -5,6 +5,9 @@ torbutton.circuit_display.this_browser = এই ব্রাউজার torbutton.circuit_display.relay = রিলেই torbutton.circuit_display.tor_bridge = ব্রিজ torbutton.circuit_display.unknown_country = অজানা দেশ +torbutton.circuit_display.guard = গার্ড +torbutton.circuit_display.guard_note = আপনার [গার্ড] নোড পরিবর্তন হতে পারে না। +torbutton.circuit_display.learn_more = আরও জানুন torbutton.content_sizer.margin_tooltip = টর ব্রাউজার আপনার উইন্ডো প্রস্থ এবং উচ্চতা নিখুঁত করতে এই মার্জিন যোগ করে, এবং এইভাবে মানুষ আপনাকে অনলাইন ট্র্যাক করার ক্ষমতা হ্রাস করে। torbutton.panel.tooltip.disabled = টর সক্রিয় করতে ক্লিক করুন torbutton.panel.tooltip.enabled = টর অক্ষম করতে ক্লিক করুন @@ -49,3 +52,7 @@ profileReadOnly=আপনি শুধুমাত্র পঠনযোগ্ profileReadOnlyMac=আপনি শুধুমাত্র পঠনযোগ্য ফাইল সিস্টেম থেকে %S চালনা করতে পারবেন না। এটি ব্যবহার করার চেষ্টা করার আগে আপনার ডেস্কটপ বা অ্যাপ্লিকেশন ফোল্ডারে %S কপি করুন। profileAccessDenied=%S প্রোফাইলটি অ্যাক্সেস করার অনুমতি নেই দয়া করে আপনার ফাইল সিস্টেমের অনুমতিগুলি সামঞ্জস্য করুন এবং আবার চেষ্টা করুন। profileMigrationFailed=আপনার বিদ্যমান %S প্রোফাইলে স্থানান্তর ব্যর্থ হয়েছে।\nনতুন সেটিংস ব্যবহার করা হবে। + +# .Onion Page Info prompt. Strings are kept here for ease of translation. +pageInfo_OnionEncryptionWithBitsAndProtocol=সংযোগ এনক্রিপ্ট (Onion Service, %1$S, %2$S bit keys, %3$S) +pageInfo_OnionEncryption=সংযোগ এনক্রিপ্ট (Onion Service) diff --git a/da/torbutton.properties b/da/torbutton.properties index 7baf9fd26..24858f679 100644 --- a/da/torbutton.properties +++ b/da/torbutton.properties @@ -1,7 +1,7 @@ -torbutton.circuit_display.internet = Internet +torbutton.circuit_display.internet = Internettet torbutton.circuit_display.ip_unknown = Ukendt IP-adresse torbutton.circuit_display.onion_site = Løg side -torbutton.circuit_display.this_browser = Denne browser +torbutton.circuit_display.this_browser = Browseren torbutton.circuit_display.relay = Relæ torbutton.circuit_display.tor_bridge = Bro torbutton.circuit_display.unknown_country = Ukendt land

1 0