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

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 7c4544e5a4780706dee65d2a3ff8c70000b55952 Merge: efa342f 60d633c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 14:45:29 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[tor/maint-0.2.3] Fix some problems with the bug9002 fix.
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 60d633c73a71d9ba514d4250fe00da5173e9968a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 11:54:57 2013 -0400 Fix some problems with the bug9002 fix. Fixes bug 9090; bug not in any released Tor. --- src/or/rendcommon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 812fce9..76786e0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1081,6 +1081,7 @@ rend_cache_store(const char *desc, size_t desc_len, int published, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(query)); + rend_service_descriptor_free(parsed); return -2; } tor_snprintf(key, sizeof(key), "0%s", query); @@ -1336,6 +1337,8 @@ rend_cache_store_v2_desc_as_client(const char *desc, "attempt to improve reliability, but it could also be an " "attempt to do a guard enumeration attack. Rejecting.", safe_str_client(rend_query->onion_address)); + retval = -2; + goto err; } } else { log_info(LD_REND, "Descriptor does not contain any introduction points.");

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 18 Jun '13

18 Jun '13

commit 00563eb2e3a5e12602b8c1af5b4691f80222345e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 18 18:16:22 2013 +0000 Update translations for tails-persistence-setup_completed --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 4e4a177..8a3c351 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-18 17:42+0000\n" +"PO-Revision-Date: 2013-06-18 18:00+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -190,7 +190,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "اي تغييرات تقوم بها لن يتم تفعيلها الا بعد اعادة التشغيل. \n\nيمكنك اغلاق هذا التطبيق" +msgstr "اي تغييرات قمت بها لن تُفعل إلا بعد إعادة تشغيل تيلز.\n\nيمكنك اغلاق هذا التطبيق الان." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 18 Jun '13

18 Jun '13

commit 7dc7ef4dabbf1081fe472f8d7c990a607b983193 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 18 18:16:18 2013 +0000 Update translations for tails-persistence-setup --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 4e4a177..8a3c351 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-18 17:42+0000\n" +"PO-Revision-Date: 2013-06-18 18:00+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -190,7 +190,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "اي تغييرات تقوم بها لن يتم تفعيلها الا بعد اعادة التشغيل. \n\nيمكنك اغلاق هذا التطبيق" +msgstr "اي تغييرات قمت بها لن تُفعل إلا بعد إعادة تشغيل تيلز.\n\nيمكنك اغلاق هذا التطبيق الان." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 18 Jun '13

18 Jun '13

commit 19eabd9b36d51545ad0442bca9fde3d575e6e97e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 18 17:46:19 2013 +0000 Update translations for tails-persistence-setup_completed --- ar/ar.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 0bb6bc2..4e4a177 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-18 17:00+0000\n" +"PO-Revision-Date: 2013-06-18 17:42+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -165,17 +165,17 @@ msgstr "غير قادر علي الكتابة علي القرص الدائم. ر #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format msgid "Tails is running from non-USB device %s." -msgstr "تايلز يعمل من جهاز غير يو اس بي %s" +msgstr "تايلز يعمل من جهاز غير USB %s " #: ../lib/Tails/Persistence/Setup.pm:513 #, perl-format msgid "Device %s is optical." -msgstr "جهاز %s غير الزامي" +msgstr "جهاز %s غير ضوئي" #: ../lib/Tails/Persistence/Setup.pm:520 #, perl-format msgid "Device %s was not created using Tails USB installer." -msgstr "جهاز %s لم يتم صنعه باستخدام مثبت تايلز" +msgstr "جهاز %s لم يتم إنشائه باستخدام مثبت تايلز الخاص بالـUSB" #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" @@ -183,7 +183,7 @@ msgstr "خطأ" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" -msgstr "مساعد التثبيت المستمر - انتهاء" +msgstr "مساعد التثبيت الدائم - انتهاء" #: ../lib/Tails/Persistence/Setup.pm:864 msgid ""

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 18 Jun '13

18 Jun '13

commit 15b8b15ee85816e8ece0aed32fbf0c1b5d8ca1bc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 18 17:46:16 2013 +0000 Update translations for tails-persistence-setup --- ar/ar.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 0bb6bc2..4e4a177 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-18 17:00+0000\n" +"PO-Revision-Date: 2013-06-18 17:42+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -165,17 +165,17 @@ msgstr "غير قادر علي الكتابة علي القرص الدائم. ر #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format msgid "Tails is running from non-USB device %s." -msgstr "تايلز يعمل من جهاز غير يو اس بي %s" +msgstr "تايلز يعمل من جهاز غير USB %s " #: ../lib/Tails/Persistence/Setup.pm:513 #, perl-format msgid "Device %s is optical." -msgstr "جهاز %s غير الزامي" +msgstr "جهاز %s غير ضوئي" #: ../lib/Tails/Persistence/Setup.pm:520 #, perl-format msgid "Device %s was not created using Tails USB installer." -msgstr "جهاز %s لم يتم صنعه باستخدام مثبت تايلز" +msgstr "جهاز %s لم يتم إنشائه باستخدام مثبت تايلز الخاص بالـUSB" #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" @@ -183,7 +183,7 @@ msgstr "خطأ" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" -msgstr "مساعد التثبيت المستمر - انتهاء" +msgstr "مساعد التثبيت الدائم - انتهاء" #: ../lib/Tails/Persistence/Setup.pm:864 msgid ""

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 18 Jun '13

18 Jun '13

commit 549d063e770b47004eb12a0d33907ab97ef01b6d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 18 17:16:17 2013 +0000 Update translations for tails-persistence-setup_completed --- ar/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 32c0eb1..0bb6bc2 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-17 23:30+0000\n" +"PO-Revision-Date: 2013-06-18 17:00+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -156,11 +156,11 @@ msgstr "القرص الدائم غير مثبت." #: ../lib/Tails/Persistence/Setup.pm:493 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "التقسيمة المستمرة ليست قابلة للقراءة. مشاكل في الصلاحيات او الملكية؟" +msgstr "القرص الدائم غير قابل للقراءة. مشاكل في الصلاحيات او الملكية؟" #: ../lib/Tails/Persistence/Setup.pm:498 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "التقسيمة المستمرة غير قابلة للكتابة. ربما تم تثبيتها للقراءة فقط؟" +msgstr "غير قادر علي الكتابة علي القرص الدائم. ربما تم تثبيته للقراءة فقط؟" #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 18 Jun '13

18 Jun '13

commit cbbffb9ffd9564668e77a8a5b72cba8cce930f3b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 18 17:16:13 2013 +0000 Update translations for tails-persistence-setup --- ar/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 32c0eb1..0bb6bc2 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-17 23:30+0000\n" +"PO-Revision-Date: 2013-06-18 17:00+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -156,11 +156,11 @@ msgstr "القرص الدائم غير مثبت." #: ../lib/Tails/Persistence/Setup.pm:493 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "التقسيمة المستمرة ليست قابلة للقراءة. مشاكل في الصلاحيات او الملكية؟" +msgstr "القرص الدائم غير قابل للقراءة. مشاكل في الصلاحيات او الملكية؟" #: ../lib/Tails/Persistence/Setup.pm:498 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "التقسيمة المستمرة غير قابلة للكتابة. ربما تم تثبيتها للقراءة فقط؟" +msgstr "غير قادر علي الكتابة علي القرص الدائم. ربما تم تثبيته للقراءة فقط؟" #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format

1 0

[tor/master] Check more return values in the unit tests
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 8a96a85d66328ba0088b9d9999771ff863cc0e60 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 12:31:03 2013 -0400 Check more return values in the unit tests --- src/test/test_config.c | 12 ++++++------ src/test/test_dir.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/test_config.c b/src/test/test_config.c index ad30cdf..4e9e13e 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -202,9 +202,9 @@ test_config_check_or_create_data_subdir(void *arg) (void)arg; #if defined (_WIN32) && !defined (WINCE) - mkdir(options->DataDirectory); + tt_int_op(mkdir(options->DataDirectory), ==, 0); #else - mkdir(options->DataDirectory, 0700); + tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0); #endif r = stat(subpath, &st); @@ -266,14 +266,14 @@ test_config_write_to_data_subdir(void *arg) (void)arg; #if defined (_WIN32) && !defined (WINCE) - mkdir(options->DataDirectory); + tt_int_op(mkdir(options->DataDirectory), ==, 0); #else - mkdir(options->DataDirectory, 0700); + tt_int_op(mkdir(options->DataDirectory, 0700), ==, 0); #endif // Write attempt shoudl fail, if subdirectory doesn't exist. test_assert(write_to_data_subdir(subdir, fname, str, NULL)); - check_or_create_data_subdir(subdir); + test_assert(! check_or_create_data_subdir(subdir)); // Content of file after write attempt should be // equal to the original string. @@ -285,7 +285,7 @@ test_config_write_to_data_subdir(void *arg) test_streq(read_file_to_str(filepath, 0, NULL), str); done: - remove(filepath); + (void) unlink(filepath); rmdir(options->DataDirectory); tor_free(datadir); tor_free(filepath); diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 56ac3b3..6c2915d 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2317,9 +2317,9 @@ test_dir_v2_dir(void *arg) /* Make a directory so there's somewhere to store the thing */ #ifdef _WIN32 - mkdir(get_fname("cached-status")); + tt_int_op(mkdir(get_fname("cached-status")), ==, 0); #else - mkdir(get_fname("cached-status"), 0700); + tt_int_op(mkdir(get_fname("cached-status"), 0700), ==, 0); #endif v2 = generate_v2_networkstatus_opinion();

1 0

[tor/master] Attempt to un-confuse coverity about (false) double-free in bench_onion_ntor.
by nickm＠torproject.org 18 Jun '13

18 Jun '13

commit 459c7c0e41f8c35c95e6012febb7e0456cce674a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 18 11:33:15 2013 -0400 Attempt to un-confuse coverity about (false) double-free in bench_onion_ntor. --- src/test/bench.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/bench.c b/src/test/bench.c index 5a8d21d..97a7909 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -204,6 +204,7 @@ bench_onion_ntor(void) for (i = 0; i < iters; ++i) { onion_skin_ntor_create(nodeid, &keypair1.pubkey, &state, os); ntor_handshake_state_free(state); + state = NULL; } end = perftime(); printf("Client-side, part 1: %f usec.\n", NANOCOUNT(start, end, iters)/1e3);

1 0