March 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Merge branch 'fix/update-gsoc-text' into develop
by isis＠torproject.org 06 Mar '14

06 Mar '14

commit fff100491206a0bc943c22e5876b0561f9b7ba57 Merge: a41cf0d d5f2563 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 6 21:41:05 2014 +0000 Merge branch 'fix/update-gsoc-text' into develop doc/gsoc2014-volunteer.txt | 117 ++++++++++---------------------------------- 1 file changed, 26 insertions(+), 91 deletions(-)

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 06 Mar '14

06 Mar '14

commit 39b6cf81de11810d582dfd01e26b1f9be69be8f6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 6 19:15:55 2014 +0000 Update translations for tails-iuk_completed --- pl.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pl.po b/pl.po index 481d108..5101353 100644 --- a/pl.po +++ b/pl.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-02-21 17:38+0100\n" -"PO-Revision-Date: 2014-02-22 15:40+0000\n" +"POT-Creation-Date: 2014-03-05 15:11+0100\n" +"PO-Revision-Date: 2014-03-06 19:00+0000\n" "Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -22,8 +22,8 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 #: ../lib/Tails/IUK/Frontend.pm:667 -msgid "For debugging information, see ~/.xsession-errors." -msgstr "Dla informacji o debugowaniu zobacz ~/.xsession-errors." +msgid "For debugging information, see /home/amnesia/.xsession-errors" +msgstr "Dla informacji o debugowaniu zobacz /home/amnesia/.xsession-errors" #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" @@ -100,7 +100,7 @@ msgstr "Wystąpił błąd podczas wyszukiwania dostępnych aktualizacji" msgid "" "<b>You should upgrade to %{name}s %{version}s.</b>\n" "\n" -"For more information about this new version, go to %{details_url}s.\n" +"For more information about this new version, go to %{details_url}s\n" "\n" "It is recommended to close all the open applications during the upgrade.\n" "Downloading the upgrade might take a long time, from several minutes to a few hours.\n" @@ -109,7 +109,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "<b>Powinieneś zaktualizować system do %{name}s %{version}s.</b>\n\nAby uzyskać więcej informacji na temat nowej wersji idź do %{details_url}s.\n\nZaleca się zamknięcie wszystkich otwartych aplikacji w czasie aktualizacji.\nPobieranie aktualizacji może zająć kilka minut, lub nawet kilka godzin.\n\nRozmiar do pobrania: %{size}s\n\nCzy chcesz teraz zaktualizować system?" +msgstr "<b>Powinieneś zaktualizować system do %{name}s %{version}s.</b>\n\nAby uzyskać więcej informacji na temat nowej wersji, idź do %{details_url}s.\n\nZaleca się zamknięcie wszystkich otwartych aplikacji w czasie aktualizacji.\nPobieranie aktualizacji może zająć sporo czasu, od kilku minut do nawet kilku godzin.\nPołączenie sieciowe zostanie wyłączone po pobraniu aktualizacji.\n\nRozmiar pliku do pobrania: %{size}s\n\nCzy chcesz teraz zaktualizować system?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" @@ -128,12 +128,12 @@ msgstr "Aktualizuj później" msgid "" "<b>You should do a manual upgrade to %{name}s %{version}s.</b>\n" "\n" -"For more information about this new version, go to %{details_url}s.\n" +"For more information about this new version, go to %{details_url}s\n" "\n" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "<b>Należy zrobić ręczną aktualizację do %{name}s %{version}s.</b>\n\nAby uzyskać więcej informacji na temat tej nowej wersji, przejdź do %{details_url}s.\n\nNie jest możliwe, automatyczne uaktualnienie Twojego urządzenia do nowej wersji: %{explanation}s.\n\nAby dowiedzieć się, jak wykonać uaktualnienie ręcznie, przejdź do https://tails.boum.org/doc/first_steps/upgrade/#manual" +msgstr "<b>Powinieneś wykonać ręczną aktualizację do %{name}s %{version}s.</b>\n\nAby uzyskać więcej informacji na temat nowej wersji, przejdź do %{details_url}s.\n\nNie jest możliwe automatyczne uaktualnienie Twojego urządzenia do nowej wersji: %{explanation}s.\n\nAby dowiedzieć się jak ręcznie zaktualizować, przejdź do https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 06 Mar '14

06 Mar '14

commit 45d2f7aa3fba4911bce8dc29d78800ac68603893 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 6 19:15:53 2014 +0000 Update translations for tails-iuk --- pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl.po b/pl.po index 1144727..5101353 100644 --- a/pl.po +++ b/pl.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 18:43+0000\n" +"PO-Revision-Date: 2014-03-06 19:00+0000\n" "Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -109,7 +109,7 @@ msgid "" "Download size: %{size}s\n" "\n" "Do you want to upgrade now?" -msgstr "" +msgstr "<b>Powinieneś zaktualizować system do %{name}s %{version}s.</b>\n\nAby uzyskać więcej informacji na temat nowej wersji, idź do %{details_url}s.\n\nZaleca się zamknięcie wszystkich otwartych aplikacji w czasie aktualizacji.\nPobieranie aktualizacji może zająć sporo czasu, od kilku minut do nawet kilku godzin.\nPołączenie sieciowe zostanie wyłączone po pobraniu aktualizacji.\n\nRozmiar pliku do pobrania: %{size}s\n\nCzy chcesz teraz zaktualizować system?" #: ../lib/Tails/IUK/Frontend.pm:385 msgid "Upgrade available" @@ -133,7 +133,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: %{explanation}s.\n" "\n" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" -msgstr "" +msgstr "<b>Powinieneś wykonać ręczną aktualizację do %{name}s %{version}s.</b>\n\nAby uzyskać więcej informacji na temat nowej wersji, przejdź do %{details_url}s.\n\nNie jest możliwe automatyczne uaktualnienie Twojego urządzenia do nowej wersji: %{explanation}s.\n\nAby dowiedzieć się jak ręcznie zaktualizować, przejdź do https://tails.boum.org/doc/first_steps/upgrade/#manual" #: ../lib/Tails/IUK/Frontend.pm:411 msgid "New version available"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 06 Mar '14

06 Mar '14

commit ad4a1133b39beb27a92acc68c07fafabcfe052e9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 6 19:15:27 2014 +0000 Update translations for tails-greeter_completed --- pl/pl.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 77995a7..ef6b2c7 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-02-21 19:40+0100\n" -"PO-Revision-Date: 2014-02-22 16:00+0000\n" +"POT-Creation-Date: 2014-03-04 11:11+0100\n" +"PO-Revision-Date: 2014-03-06 19:00+0000\n" "Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" @@ -117,8 +117,8 @@ msgid "MAC address spoofing" msgstr "Spoofing adresu MAC" #: ../glade/optionswindow.glade.h:15 -msgid "<a href=\"doc/advanced_topics/mac_changer.en.html\">Help</a>" -msgstr "<a href=\"doc/advanced_topics/mac_changer.en.html\">Pomoc</a>" +msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Pomoc</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -129,8 +129,8 @@ msgstr "Spoofing adresu MAC ukrywa number seryjny Twojej kart sieciowych przed l #: ../glade/optionswindow.glade.h:17 msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " -"suspicion or cause network connection problems. See the documentation." -msgstr "Generalnie bezpiecznej jest po spoofingu adresu MAC, ale może to wzbudzić podejżenia lub wywołać problemy z połączeniem sieciowym. Proszę zobacz dokumentację." +"suspicion or cause network connection problems." +msgstr "Generalnie bezpiecznej jest korzystać z interntu po spoofingu adresu MAC, jednakże może to wzbudzić podejżenia lub wywołać problemy z połączeniem sieciowym." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 06 Mar '14

06 Mar '14

commit b091ca34cdd66383e2a43182dca1315a1c86a48c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 6 19:15:23 2014 +0000 Update translations for tails-greeter --- pl/pl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pl/pl.po b/pl/pl.po index 4dd574e..ef6b2c7 100644 --- a/pl/pl.po +++ b/pl/pl.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-06 19:00+0000\n" +"Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -118,7 +118,7 @@ msgstr "Spoofing adresu MAC" #: ../glade/optionswindow.glade.h:15 msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Pomoc</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -130,7 +130,7 @@ msgstr "Spoofing adresu MAC ukrywa number seryjny Twojej kart sieciowych przed l msgid "" "It is generally safer to spoof MAC addresses, but it might also raise " "suspicion or cause network connection problems." -msgstr "" +msgstr "Generalnie bezpiecznej jest korzystać z interntu po spoofingu adresu MAC, jednakże może to wzbudzić podejżenia lub wywołać problemy z połączeniem sieciowym." #: ../glade/optionswindow.glade.h:18 msgid "Spoof all MAC addresses"

1 0

r26641: {website} Formatted the new FAQ entry; restored a deleted but still us (website/trunk/docs/en)
by Matt Pagan 06 Mar '14

06 Mar '14

Author: mttp Date: 2014-03-06 19:04:46 +0000 (Thu, 06 Mar 2014) New Revision: 26641 Modified: website/trunk/docs/en/faq.wml Log: Formatted the new FAQ entry; restored a deleted but still useful entry. Modified: website/trunk/docs/en/faq.wml =================================================================== --- website/trunk/docs/en/faq.wml 2014-03-06 16:52:25 UTC (rev 26640) +++ website/trunk/docs/en/faq.wml 2014-03-06 19:04:46 UTC (rev 26641) @@ -164,8 +164,6 @@ <li><a href="#WhyIsntMyRelayBeingUsedMore">Why isn't my relay being used more?</a></li> <li><a href="#IDontHaveAStaticIP">I don't have a static IP.</a></li> - <li><a href="#ModemKeepsCrashing">My cable/dsl modem keeps crashing. - What's going on?</a></li> <li><a href="#PortscannedMore">Why do I get portscanned more often when I run a Tor relay?</a></li> <li><a href="#MoreThanOneCPU">I have more than one CPU. Does this @@ -1102,6 +1100,22 @@ <hr> + <a id="VirusFalsePositives"></a> + <h3><a class="anchor" href="#VirusFalsePositives"></a></h3> + <p> + Sometimes, overzealous Windows virus and spyware detectors trigger on + some parts of the Tor Windows binary. Our best guess is that these are + false positives — after all, the anti-virus and anti-spyware business is + just a guessing game anyway. You should contact your vendor and explain + that you have a program that seems to be triggering false positives. Or + pick a better vendor. + </p> + <p>In the meantime, we encourage you to not just take our word for it. + Our job is to provide the source; if you're concerned, please do + recompile it yourself.</p> + + <hr> + <a id="tarballs"></a> <h3><a class="anchor" href="#tarballs">How do I open a .tar.gz or .tar.xz file?</a></h3> @@ -1109,7 +1123,7 @@ <p> Tar is a common archive utility for Unix and Linux systems. If your system has a mouse, you can usually open them by double clicking. - Otherwise open a command prompt and execute + Otherwise open a command prompt and execute</p> <pre>tar xzf <FILENAME>.tar.gz</pre> or <pre>tar xJf <FILENAME>.tar.xz</pre> <p> as documented on tar's man page. @@ -2452,28 +2466,6 @@ <hr> - <a id="ModemKeepsCrashing"></a> - <h3><a class="anchor" href="#ModemKeepsCrashing">My cable/DSL modem - keeps crashing. What's going on?</h3></a> - - <p> - Tor relays hold many connections open at once. This is more intensive - use than your cable modem (or other home router) would ever get normally. - So if there are any bugs or instabilities, they might show up now. - </p> - <p> - If your router keeps crashing, you've got two options. First, you should - try to upgrade its firmware. If you need tips on how to do this, ask - Google or your cable/router provider, or try the Tor IRC channel. - </p> - - <p> - Usually the firmware upgrade will fix it. If it doesn't, you will - probably want to get a new (better) router. - </p> - - <hr> - <a id="PortscannedMore"></a> <h3><a class="anchor" href="#PortscannedMore">Why do I get portscanned more often when I run a Tor relay?</a></h3> @@ -2797,7 +2789,7 @@ <hr> <a id="BestOSForRelay"></a> - <h3><a class="anchor" href="#BestOSForRelay">Why doesn't my Windows (or other OS) Tor relay run well?</a> + <h3><a class="anchor" href="#BestOSForRelay">Why doesn't my Windows (or other OS) Tor relay run well?</h3></a> <p> Tor relays work best on Linux, FreeBSD 5.x+, OS X Tiger or

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 06 Mar '14

06 Mar '14

commit 2074b55ac6447748627de2ddb5ebd7ccd9a96ad2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 6 18:45:47 2014 +0000 Update translations for tails-iuk --- pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pl.po b/pl.po index 19a4b81..1144727 100644 --- a/pl.po +++ b/pl.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 08:17+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-06 18:43+0000\n" +"Last-Translator: sebx\n" "Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,7 +23,7 @@ msgstr "" #: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 #: ../lib/Tails/IUK/Frontend.pm:667 msgid "For debugging information, see /home/amnesia/.xsession-errors" -msgstr "" +msgstr "Dla informacji o debugowaniu zobacz /home/amnesia/.xsession-errors" #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades"

1 0

[tor/master] tinytest tt_{mem, str}_op now handle NULLs better
by nickm＠torproject.org 06 Mar '14

06 Mar '14

commit 065097b81bad3326a9bd536fbdf646f408638a94 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 6 12:12:13 2014 -0500 tinytest tt_{mem,str}_op now handle NULLs better Now a NULL argument to either makes it fail, not crash. Fies bug 9004; bugfix on 0.2.2.4-alpha. --- changes/bug9004 | 6 ++++++ src/ext/tinytest_macros.h | 9 +++++++-- src/test/test.h | 13 +++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/changes/bug9004 b/changes/bug9004 new file mode 100644 index 0000000..5bab7ea --- /dev/null +++ b/changes/bug9004 @@ -0,0 +1,6 @@ + o Minor bugfixes (testing): + - Improve the tinytest implementation of string operation tests + so that comparisons NULL strings no longer crash the tests; + they now just fail, normally. Fixes bug 9004; bugfix on + 0.2.2.4-alpha. + diff --git a/src/ext/tinytest_macros.h b/src/ext/tinytest_macros.h index 9ff69b1..5bb8f8e 100644 --- a/src/ext/tinytest_macros.h +++ b/src/ext/tinytest_macros.h @@ -144,6 +144,10 @@ tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt, \ {print_=value_;},{},die_on_fail) +#define tt_assert_test_type_opt(a,b,str_test,type,test,fmt,die_on_fail) \ + tt_assert_test_fmt_type(a,b,str_test,type,test,type,fmt, \ + {print_=value_?value_:"<NULL>";},{},die_on_fail) + /* Helper: assert that a op b, when cast to type. Format the values with * printf format fmt on failure. */ #define tt_assert_op_type(a,op,b,type,fmt) \ @@ -163,8 +167,9 @@ (val1_ op val2_),"%p",TT_EXIT_TEST_FUNCTION) #define tt_str_op(a,op,b) \ - tt_assert_test_type(a,b,#a" "#op" "#b,const char *, \ - (strcmp(val1_,val2_) op 0),"<%s>",TT_EXIT_TEST_FUNCTION) + tt_assert_test_type_opt(a,b,#a" "#op" "#b,const char *, \ + (val1_ && val2_ && strcmp(val1_,val2_) op 0),"<%s>", \ + TT_EXIT_TEST_FUNCTION) #define tt_want_int_op(a,op,b) \ tt_assert_test_type(a,b,#a" "#op" "#b,long,(val1_ op val2_),"%ld",(void)0) diff --git a/src/test/test.h b/src/test/test.h index a89b558..b902c6e 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -38,12 +38,17 @@ #define test_mem_op(expr1, op, expr2, len) \ tt_assert_test_fmt_type(expr1,expr2,#expr1" "#op" "#expr2, \ const char *, \ - (memcmp(val1_, val2_, len) op 0), \ + (val1_ && val2_ && memcmp(val1_, val2_, len) op 0), \ char *, "%s", \ { size_t printlen = (len)*2+1; \ - print_ = tor_malloc(printlen); \ - base16_encode(print_, printlen, value_, \ - (len)); }, \ + if (value_) { \ + print_ = tor_malloc(printlen); \ + base16_encode(print_, printlen, value_, \ + (len)); \ + } else { \ + print_ = tor_strdup("null"); \ + } \ + }, \ { tor_free(print_); }, \ TT_EXIT_TEST_FUNCTION \ );

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 06 Mar '14

06 Mar '14

commit a50690e68f8a332321e88f0ac8c3046186bc1c1f Merge: 4a2a1e5 cbf9e74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 6 11:52:22 2014 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9393 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Correct the URL in the "a relay on win95???" message
by nickm＠torproject.org 06 Mar '14

06 Mar '14

commit cbf9e742368158b927249913b395b3796d847a92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 6 09:57:42 2014 -0500 Correct the URL in the "a relay on win95???" message This is a fix for 9393; it's not a bugfix on any Tor version per se, but rather on whatever Tor version was current when we reorganized the wiki. --- changes/bug9393 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug9393 b/changes/bug9393 new file mode 100644 index 0000000..9aedd12 --- /dev/null +++ b/changes/bug9393 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Give the correct URL in the warning message that we present + when the user is trying to run a Tor relay on an ancient version + of Windows. Fixes bug 9393. diff --git a/src/or/config.c b/src/or/config.c index 3984755..ef02946 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2319,7 +2319,7 @@ options_validate(or_options_t *old_options, or_options_t *options, !strcmpstart(uname, "Windows Me"))) { log_warn(LD_CONFIG, "Tor is running as a server, but you are " "running %s; this probably won't work. See " - "https://wiki.torproject.org/TheOnionRouter/TorFAQ#ServerOS " + "https://www.torproject.org/docs/faq.html#BestOSForRelay " "for details.", uname); }

1 0