January 2012 - tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 4dbe6cc2e4e9b4c7a3b18978023a7832e0361f79 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 15:15:17 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 41 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index 02f5d99..f815726 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 14:37+0000\n" +"PO-Revision-Date: 2012-01-29 15:14+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -3317,6 +3317,9 @@ msgid "" "software, which may contain important security, reliability and performance " "fixes." msgstr "" +"Вы используете версию Tor \"%1\", которая более не рекомендуется для " +"использования. Пожалуйста, обновитесь до последней версии, которая может " +"содержать важные исправления безопасности, надежности и производительности." msgctxt "StatusEventWidget" msgid "" @@ -3325,6 +3328,9 @@ msgid "" "version of the software, which may contain important security, reliability " "and performance fixes." msgstr "" +"Вы используете версию Tor \"%1\", которая может более не работать с текущей " +"версией сети Tor. Пожалуйста, обновитесь до последней версии, которая может " +"содержать важные исправления безопасности, надежности и производительности." msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" @@ -3339,6 +3345,8 @@ msgid "" "We were able to successfully establish a connection to the Tor network. You " "can now configure your applications to use the Internet anonymously." msgstr "" +"Мы смогли успешно установить соединение с сетью Tor. Теперь вы можете " +"настроить ваши приложения для анонимного использования Интернет." msgctxt "StatusEventWidget" msgid "Tor Software Error" @@ -3349,6 +3357,8 @@ msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" msgstr "" +"Произошла внутренняя ошибка Tor. Пожалуйста, сообщите следующее сообщение об" +" ошибке разработчикам Tor на bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid "" @@ -3357,6 +3367,9 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"Tor обнаружил, что часы вашего компьютера возможно отстают на %1 секунд по " +"сравнению с \"%2\". Если ваши часы не правильны, Tor не сможет работать. " +"Пожалуйста, проверьте что ваш компьютер показывает правильное время." msgctxt "StatusEventWidget" msgid "" @@ -3365,6 +3378,9 @@ msgid "" "will not be able to function. Please verify your computer displays the " "correct time." msgstr "" +"Tor обнаружил, что часы вашего компьютера возможно спешат на %1 секунд по " +"сравнению с \"%2\". Если ваши часы не правильны, Tor не сможет работать. " +"Пожалуйста, проверьте что ваш компьютер показывает правильное время." msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" @@ -3377,6 +3393,10 @@ msgid "" "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." msgstr "" +"Одно из приложений на вашем компьютере возможно попыталось создать " +"незашифрованное соединение через Tor на порт %1. Отправлять незашифрованную " +"информацию через сеть Tor опасно и не рекомендуется. Для вашей безопасности " +"Tor автоматически закрыл это соединение." msgctxt "StatusEventWidget" msgid "" @@ -3384,6 +3404,9 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." msgstr "" +"Одно из приложений на вашем компьютере возможно попыталось создать " +"незашифрованное соединение через Tor на порт %1. Отправлять незашифрованную " +"информацию через сеть Tor опасно и не рекомендуется." msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" @@ -3396,6 +3419,10 @@ msgid "" "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." msgstr "" +"Одно из ваших приложений установило соединение через Tor на %1, используя " +"протокол, который может привести у утечке информации о вашем адресате. " +"Пожалуйста, удостоверьтесь, что вы настроили ваши приложения на " +"использование только SOCKS4a или SOCKS5 с удаленным разрешением имен хостов." msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" @@ -3407,6 +3434,10 @@ msgid "" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." msgstr "" +"Одно из ваших приложений попыталось установить соединение через Tor " +"используя протокол неизвестный Tor. Пожалуйста, удостоверьтесь, что вы " +"настроили ваши приложения на использование только SOCKS4a или SOCKS5 с " +"удаленным разрешением имен хостов." msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" @@ -3418,6 +3449,9 @@ msgid "" "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." msgstr "" +"Одно из ваших приложений попыталось установить соединение через Tor к " +"\"%1\", что не было распознано Tor как действительное имя хоста. Пожалуйста," +" проверьте настройки ваших приложений." msgctxt "StatusEventWidget" msgid "External IP Address Changed" @@ -3429,6 +3463,9 @@ msgid "" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." msgstr "" +"Tor определил, что публичный IP адрес вашего ретранслятора сейчас - %1%2. " +"Если это неверно, пожалуйста рассмотрите возможность установки опции 'Адрес'" +" в настройках вашего ретранслятора." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" @@ -3515,7 +3552,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" -msgstr "" +msgstr "Дескриптор Ретранслятора Отклонён" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 574e0fcbcce68bd833f8959f3df3391ee84eac91 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 14:45:15 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index 9b84607..02f5d99 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 03:50+0000\n" +"PO-Revision-Date: 2012-01-29 14:37+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -1325,6 +1325,9 @@ msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" msgstr "" +"с описанием того, что вы делали перед аварийным завершением работы " +"приложения, а так же следующие файлы связанные с отчетом об аварийном " +"завершении работы:" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -3303,6 +3306,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Нажмите \"Запустить Tor\" в Панели Управления Vidalia что бы перезапустить " +"Tor. Если Tor был неожиданно завершен, выберите выше вкладку \"Расширенные\"" +" для просмотра информации о произошедших ошибках." msgctxt "StatusEventWidget" msgid ""

1 0

[vidalia/master] Fold in more changes
by chiiph＠torproject.org 29 Jan '12

29 Jan '12

commit 13969f9f15ab8409d0031795a4f6672465ec4b02 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Jan 29 11:38:58 2012 -0300 Fold in more changes --- CHANGELOG | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5c07097..7252f80 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,6 +40,8 @@ the validation is now delegated to Tor through SETCONF. o Explicitly disable SocksPort auto by setting it to its default (9050). Fixes bug 4598. + o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means + the user can't write the torrc file. Fixes bug 4833. 0.2.15 07-Oct-2011 o Draw the bandwidth graph curves based on the local maximum, not

1 0

[vidalia/master] Don't write torrc on SIGHUP if SAVECONF fails
by chiiph＠torproject.org 29 Jan '12

29 Jan '12

commit ab0c63dc0833e2cd8054d344f0705f4b7f126dad Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Jan 20 12:37:27 2012 -0300 Don't write torrc on SIGHUP if SAVECONF fails --- src/torcontrol/TorControl.cpp | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index 730e821..3cf7467 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -910,7 +910,14 @@ bool TorControl::saveConf(QString *errmsg) { ControlCommand cmd("SAVECONF"); - return send(cmd, errmsg); + bool ret = send(cmd, errmsg); + + if(!ret) { + QString err; + setConf("__ReloadTorrcOnSIGHUP", "0", &err); + } + + return ret; } /** Tells Tor to reset the given configuration keys back to defaults. */

1 0

[vidalia/master] Remove the last changes file
by chiiph＠torproject.org 29 Jan '12

29 Jan '12

commit fd8c007a0b1504e89a768853b87a91d0109d0e2c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Jan 29 11:43:11 2012 -0300 Remove the last changes file --- changes/bug4833 | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/changes/bug4833 b/changes/bug4833 deleted file mode 100644 index 2b31765..0000000 --- a/changes/bug4833 +++ /dev/null @@ -1,2 +0,0 @@ - o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means - the user can't write the torrc file. Fixes bug 4833. \ No newline at end of file

1 0

[vidalia/master] Add a changes file
by chiiph＠torproject.org 29 Jan '12

29 Jan '12

commit 624451f698a7ebca872ef86f910f75d391659547 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:10:23 2012 -0300 Add a changes file --- changes/bug4833 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4833 b/changes/bug4833 new file mode 100644 index 0000000..2b31765 --- /dev/null +++ b/changes/bug4833 @@ -0,0 +1,2 @@ + o Sets __ReloadTorrcOnSIGHUP to 0 if SAVECONF failed, which means + the user can't write the torrc file. Fixes bug 4833. \ No newline at end of file

1 0

r25359: {website} put the diagram at the top; fix a typo; get rid of the clien (website/trunk/projects/en)
by Roger Dingledine 29 Jan '12

29 Jan '12

Author: arma Date: 2012-01-29 13:35:00 +0000 (Sun, 29 Jan 2012) New Revision: 25359 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: put the diagram at the top; fix a typo; get rid of the client-side log window since it didn't show anything. Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-29 13:34:15 UTC (rev 25358) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-29 13:35:00 UTC (rev 25359) @@ -16,6 +16,8 @@ <h1 id="instructions">Obfsproxy Instructions</h1> + <img src="$(IMGROOT)/obfsproxy_diagram.png" alt="client torrc"></a> + <h3>Step 1: Install dependencies, obfsproxy, and Tor</h3> <br> @@ -59,7 +61,8 @@ <br> <p> - Add the appropriate lines to your tor configuration file: + Add the appropriate lines to your <a href="<page docs/faq>#torrc">tor + configuration file</a>: </p> <p> @@ -69,19 +72,10 @@ </p> <p> - Don't forget to replace <em>192.0.2.34</em> with the IP address of - the bridge you wish to use, and <em>34545</em> with the port - obfpsroxy is listening on. + Don't forget to replace <em>192.0.2.34:34545</em> with the IP address + and port that the bridge's obfsproxy is listening on. </p> - <p> - Launch Tor using this configuration file. You can do this by using - your favorite init script, or by pointing the Tor binary to the - torrc file: - </p> - - <img src="$(IMGROOT)/obfs-spawn_tor_client.png" alt="spawn tor" height="101" width="882"> - <p> <br> <img src="$(IMGROOT)/sidenav-arrow.png"> <strong>Congratulations!</strong> Your traffic should now be @@ -98,7 +92,8 @@ <br> <p> - Add the appropriate lines to your tor configuration file: + Add the appropriate lines to your <a href="<page docs/faq>#torrc">tor + configuration file</a>: </p> <p>

1 0

r25358: {website} there is no 'obfsproxy' download yet (website/trunk/projects/en)
by Roger Dingledine 29 Jan '12

29 Jan '12

Author: arma Date: 2012-01-29 13:34:15 +0000 (Sun, 29 Jan 2012) New Revision: 25358 Modified: website/trunk/projects/en/obfsproxy.wml Log: there is no 'obfsproxy' download yet Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-01-28 14:08:25 UTC (rev 25357) +++ website/trunk/projects/en/obfsproxy.wml 2012-01-29 13:34:15 UTC (rev 25358) @@ -47,8 +47,6 @@ <h2><a class="anchor" href="<page projects/obfsproxy-instructions>#instructions">Installation Instructions</a></h2> - <h2><a href="https://gitweb.torproject.org/obfsproxy.git">Download</a></h2> - <p> Please open a <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">ticket</a>

1 0

[stem/master] Providing higher test runtime accuracy if low
by atagar＠torproject.org 29 Jan '12

29 Jan '12

commit 9b5e2295a2217081cf772ce3b0f24f88eb3dac34 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 28 12:06:29 2012 -0800 Providing higher test runtime accuracy if low It looks kinda odd to say that the unit testing runtime is "0 seconds", so raising the accuracy when the runtime is less than a second. --- run_tests.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 8467e2f..755eda3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -314,7 +314,9 @@ if __name__ == '__main__': # TODO: note unused config options afterward? - runtime_label = "(%i seconds)" % (time.time() - start_time) + runtime = time.time() - start_time + if runtime < 1: runtime_label = "(%0.1f seconds)" % runtime + else: runtime_label = "(%i seconds)" % runtime if error_tracker.has_error_occured(): test.output.print_line("TESTING FAILED %s" % runtime_label, term.Color.RED, term.Attr.BOLD)

1 0

[stem/master] Enum constructor function for capitalized values
by atagar＠torproject.org 29 Jan '12

29 Jan '12

commit db9d695f16dc2f2ec409be40aa69d7d13cf24826 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 28 11:22:38 2012 -0800 Enum constructor function for capitalized values On occasion we want enumerations where the values are capitalized (for instance logging runlevels and integ targets). This could be done in a succinct fasion via a bit of python hackery but it wasn't pretty. Providing a function to do this instead. --- run_tests.py | 4 ++-- stem/util/enum.py | 23 ++++++++++++++++++++++- stem/util/log.py | 5 +---- test/unit/util/enum.py | 9 +++++++++ 4 files changed, 34 insertions(+), 7 deletions(-) diff --git a/run_tests.py b/run_tests.py index d4d2fd6..8467e2f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -51,7 +51,7 @@ CONFIG = stem.util.conf.config_dict("test", { "target.torrc": {}, }) -Target = stem.util.enum.Enum(*[(v, v) for v in ( +Target = stem.util.enum.UppercaseEnum( "ONLINE", "RELATIVE", "RUN_NONE", @@ -63,7 +63,7 @@ Target = stem.util.enum.Enum(*[(v, v) for v in ( "RUN_SCOOKIE", "RUN_PTRACE", "RUN_ALL", -)]) +) DEFAULT_RUN_TARGET = Target.RUN_OPEN diff --git a/stem/util/enum.py b/stem/util/enum.py index c750352..ccc9590 100644 --- a/stem/util/enum.py +++ b/stem/util/enum.py @@ -15,11 +15,13 @@ with overwritten string counterparts: 'Cat' to_camel_case - converts a string to camel case +UppercaseEnum - Provides an enum instance with capitalized values. Enum - Provides a basic, ordered enumeration. - |- values - string representation of our enums + |- keys - string representation of our enum keys |- index_of - indice of an enum value |- next - provides the enum after a given enum value |- previous - provides the enum before a given value + |- __getitem__ - provides the value for an enum key +- __iter__ - iterator over our enum keys """ @@ -42,6 +44,25 @@ def to_camel_case(label, word_divider = " "): return word_divider.join(words) +def UppercaseEnum(*args): + """ + Provides an Enum instance where the values are identical to the keys. Since + the keys are uppercase by convention this means the values are too. For + instance... + + >>> runlevels = UppercaseEnum("DEBUG", "INFO", "NOTICE", "WARN", "ERROR") + >>> runlevels.DEBUG + 'DEBUG' + + Arguments: + args (str) - list of enum keys to initialize with + + Returns: + stem.util.Enum instance with the given keys + """ + + return Enum(*[(v, v) for v in args]) + class Enum: """ Basic enumeration. diff --git a/stem/util/log.py b/stem/util/log.py index 65d5659..a25e3fd 100644 --- a/stem/util/log.py +++ b/stem/util/log.py @@ -36,10 +36,7 @@ import stem.util.enum # Logging runlevels. These are *very* commonly used so including shorter # aliases (so they can be referenced as log.DEBUG, log.WARN, etc). -Runlevel = stem.util.enum.Enum( - ("TRACE", "TRACE"), ("DEBUG", "DEBUG"), ("INFO", "INFO"), - ("NOTICE", "NOTICE"), ("WARN", "WARN"), ("ERROR", "ERROR")) - +Runlevel = stem.util.enum.UppercaseEnum("TRACE", "DEBUG", "INFO", "NOTICE", "WARN", "ERROR") TRACE, DEBUG, INFO, NOTICE, WARN, ERR = list(Runlevel) # mapping of runlevels to the logger module's values, TRACE and DEBUG aren't diff --git a/test/unit/util/enum.py b/test/unit/util/enum.py index b688a27..5a28f62 100644 --- a/test/unit/util/enum.py +++ b/test/unit/util/enum.py @@ -35,6 +35,15 @@ class TestEnum(unittest.TestCase): self.assertEquals("Skippy", pets.DOG) self.assertEquals("Cat", pets.CAT) + def test_uppercase_enum_example(self): + """ + Checks that the pydoc example for the UppercaseEnum constructor function is + accurate. + """ + + runlevels = stem.util.enum.UppercaseEnum("DEBUG", "INFO", "NOTICE", "WARN", "ERROR") + self.assertEquals("DEBUG", runlevels.DEBUG) + def test_enum_methods(self): """ Exercises enumeration methods.

1 0