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

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit c0f33e2ed0c648bf5f5245e4b72a2274223b4bca Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 21:16:31 2013 +0000 Update translations for mat-gui --- ru.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ru.po b/ru.po index 073c71f..89f3819 100644 --- a/ru.po +++ b/ru.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-09-03 20:44+0000\n" +"PO-Revision-Date: 2013-09-03 20:50+0000\n" "Last-Translator: Bergitte <alvina_alexandrova(a)mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" @@ -37,7 +37,7 @@ msgstr "Поддерживаемые файлы" #: mat-gui:164 msgid "No metadata found" -msgstr "" +msgstr "Метаданные не найдены" #: mat-gui:165 mat-gui:370 mat-gui:385 data/mat.ui:227 msgid "Clean" @@ -152,7 +152,7 @@ msgstr "Имя" #: data/mat.ui:414 msgid "Content" -msgstr "" +msgstr "Содержание" #: data/mat.ui:448 msgid "Supported formats" @@ -160,11 +160,11 @@ msgstr "Поддерживаемые форматы" #: data/mat.ui:482 msgid "Support" -msgstr "" +msgstr "Поддержка" #: data/mat.ui:508 msgid "Method" -msgstr "" +msgstr "Метод" #: data/mat.ui:521 msgid "Remaining" @@ -172,4 +172,4 @@ msgstr "" #: data/mat.ui:556 msgid "Fileformat" -msgstr "" +msgstr "Формат файла"

1 0

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

03 Sep '13

commit 96c0059f7b2223907d80b5082c15afdb4dbaf678 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 21:16:19 2013 +0000 Update translations for tails-persistence-setup --- ru/ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru/ru.po b/ru/ru.po index ae7b5c0..4048398 100644 --- a/ru/ru.po +++ b/ru/ru.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bergitte <alvina_alexandrova(a)mail.ru>, 2013 # hypa <bbbalda(a)mail.ru>, 2012 # Den Arefyev <>, 2012 # Арефьев Денис <jujjer(a)gmail.com>, 2013 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 16:49+0200\n" -"PO-Revision-Date: 2013-08-02 08:38+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-09-03 21:00+0000\n" +"Last-Translator: Bergitte <alvina_alexandrova(a)mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -280,7 +281,7 @@ msgstr "Сохранение..." #: ../lib/Tails/Persistence/Step/Configure.pm:140 msgid "Saving persistence configuration..." -msgstr "" +msgstr "Сохранение текущей конфигурации..." #: ../lib/Tails/Persistence/Step/Delete.pm:40 msgid "Persistence wizard - Persistent volume deletion"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 467cb940ed784b12f05392537a02a8782b8b3c78 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 20:46:28 2013 +0000 Update translations for mat-gui --- ru.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ru.po b/ru.po index 8651006..073c71f 100644 --- a/ru.po +++ b/ru.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Bergitte <alvina_alexandrova(a)mail.ru>, 2013 # Arioko <arikushi777(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-07-01 19:26+0200\n" -"PO-Revision-Date: 2013-07-25 09:22+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-09-03 20:44+0000\n" +"Last-Translator: Bergitte <alvina_alexandrova(a)mail.ru>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -49,7 +50,7 @@ msgstr "Грязный" #: mat-gui:172 #, python-format msgid "%s's metadata" -msgstr "" +msgstr "%s's метаданные" #: mat-gui:183 msgid "Trash your meta, keep your data"

1 0

[tor/master] Add a clarification to gcov instructions
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 11352b0ce152624553c7e698242144c2470db362 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 15:44:13 2013 -0400 Add a clarification to gcov instructions --- doc/HACKING | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/HACKING b/doc/HACKING index b4d2586..9f9e644 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -133,6 +133,7 @@ line was never reached. Lines with numbers were called that number of times. If that doesn't work: * Try configuring Tor with --disable-gcc-hardening + * You might need to run 'make clean' after you run './configure'. Profiling Tor with oprofile ~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

[tor/master] Use SOCKET_OK/TOR_INVALID_SOCKET in socketpair replacement code
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 031e695aa50f24000ec112d535636807167be436 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 6 16:41:53 2013 -0400 Use SOCKET_OK/TOR_INVALID_SOCKET in socketpair replacement code --- src/common/compat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 69eb064..bf6a0a4 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1225,9 +1225,9 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) * for now, and really, when localhost is down sometimes, we * have other problems too. */ - tor_socket_t listener = -1; - tor_socket_t connector = -1; - tor_socket_t acceptor = -1; + tor_socket_t listener = TOR_INVALID_SOCKET; + tor_socket_t connector = TOR_INVALID_SOCKET; + tor_socket_t acceptor = TOR_INVALID_SOCKET; struct sockaddr_in listen_addr; struct sockaddr_in connect_addr; int size; @@ -1306,11 +1306,11 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) tidy_up_and_fail: if (saved_errno < 0) saved_errno = errno; - if (listener != -1) + if (SOCKET_OK(listener)) tor_close_socket(listener); - if (connector != -1) + if (SOCKET_OK(connector)) tor_close_socket(connector); - if (acceptor != -1) + if (SOCKET_OK(acceptor)) tor_close_socket(acceptor); return -saved_errno; #endif

1 0

[tor/master] Avoid a double-close on one failing case of the socketpair replacement code
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit d819663b661aea4f276404224fec6fe9c33f0bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 6 16:41:57 2013 -0400 Avoid a double-close on one failing case of the socketpair replacement code Fix for bug 9400, spotted by coverity. Bug introduced in revision 2cb4f7a4 (subversion revision r389). --- changes/bug9400 | 7 +++++++ src/common/compat.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug9400 b/changes/bug9400 new file mode 100644 index 0000000..9742240 --- /dev/null +++ b/changes/bug9400 @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - Avoid double-closing the listener socket in our socketpair replacement + (used on Windows) in the case where the addresses on our opened + sockets don't match what we expected. Fixes bug 9400; bugfix on + every released Tor version. Found by Coverity. + diff --git a/src/common/compat.c b/src/common/compat.c index bf6a0a4..d88c5f9 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1281,7 +1281,6 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) goto tidy_up_and_fail; if (size != sizeof(listen_addr)) goto abort_tidy_up_and_fail; - tor_close_socket(listener); /* Now check we are talking to ourself by matching port and host on the two sockets. */ if (getsockname(connector, (struct sockaddr *) &connect_addr, &size) == -1) @@ -1292,6 +1291,7 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) || listen_addr.sin_port != connect_addr.sin_port) { goto abort_tidy_up_and_fail; } + tor_close_socket(listener); fd[0] = connector; fd[1] = acceptor;

1 0

[tor/master] Merge branch 'bug9400_024_squashed' into maint-0.2.4
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit a8e76de4d997690917432d0d60383a1333f80baa Merge: a5610cf d819663 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 15:38:54 2013 -0400 Merge branch 'bug9400_024_squashed' into maint-0.2.4 changes/bug9400 | 7 +++++++ src/common/compat.c | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 9b2a0f5c755b0dc4a93c6a77e3f6bdb59a3ba96c Merge: 5c9008e a8e76de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 15:41:50 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug9400 | 7 +++++++ src/common/compat.c | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --cc src/common/compat.c index 3768933,d88c5f9..d6ea418 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -1313,12 -1225,12 +1313,12 @@@ tor_ersatz_socketpair(int family, int t * for now, and really, when localhost is down sometimes, we * have other problems too. */ - tor_socket_t listener = -1; - tor_socket_t connector = -1; - tor_socket_t acceptor = -1; + tor_socket_t listener = TOR_INVALID_SOCKET; + tor_socket_t connector = TOR_INVALID_SOCKET; + tor_socket_t acceptor = TOR_INVALID_SOCKET; struct sockaddr_in listen_addr; struct sockaddr_in connect_addr; - int size; + socklen_t size; int saved_errno = -1; if (protocol @@@ -1394,15 -1306,15 +1394,15 @@@ tidy_up_and_fail: if (saved_errno < 0) saved_errno = errno; - if (listener != -1) + if (SOCKET_OK(listener)) tor_close_socket(listener); - if (connector != -1) + if (SOCKET_OK(connector)) tor_close_socket(connector); - if (acceptor != -1) + if (SOCKET_OK(acceptor)) tor_close_socket(acceptor); return -saved_errno; -#endif } +#endif /** Number of extra file descriptors to keep in reserve beyond those that we * tell Tor it's allowed to use. */

1 0

[tor/maint-0.2.4] Avoid a double-close on one failing case of the socketpair replacement code
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit d819663b661aea4f276404224fec6fe9c33f0bd9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 6 16:41:57 2013 -0400 Avoid a double-close on one failing case of the socketpair replacement code Fix for bug 9400, spotted by coverity. Bug introduced in revision 2cb4f7a4 (subversion revision r389). --- changes/bug9400 | 7 +++++++ src/common/compat.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug9400 b/changes/bug9400 new file mode 100644 index 0000000..9742240 --- /dev/null +++ b/changes/bug9400 @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - Avoid double-closing the listener socket in our socketpair replacement + (used on Windows) in the case where the addresses on our opened + sockets don't match what we expected. Fixes bug 9400; bugfix on + every released Tor version. Found by Coverity. + diff --git a/src/common/compat.c b/src/common/compat.c index bf6a0a4..d88c5f9 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1281,7 +1281,6 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) goto tidy_up_and_fail; if (size != sizeof(listen_addr)) goto abort_tidy_up_and_fail; - tor_close_socket(listener); /* Now check we are talking to ourself by matching port and host on the two sockets. */ if (getsockname(connector, (struct sockaddr *) &connect_addr, &size) == -1) @@ -1292,6 +1291,7 @@ tor_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) || listen_addr.sin_port != connect_addr.sin_port) { goto abort_tidy_up_and_fail; } + tor_close_socket(listener); fd[0] = connector; fd[1] = acceptor;

1 0

[tor/maint-0.2.4] Merge branch 'bug9400_024_squashed' into maint-0.2.4
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit a8e76de4d997690917432d0d60383a1333f80baa Merge: a5610cf d819663 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 15:38:54 2013 -0400 Merge branch 'bug9400_024_squashed' into maint-0.2.4 changes/bug9400 | 7 +++++++ src/common/compat.c | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-)

1 0