- tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 02 Dec '11

02 Dec '11

commit eff0429b234bb7bd7abee9713ffc846a85011079 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Dec 2 22:45:03 2011 +0000 Update translations for gettor --- cs/gettor.po | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/cs/gettor.po b/cs/gettor.po index 931ea98..a63a91a 100644 --- a/cs/gettor.po +++ b/cs/gettor.po @@ -5,13 +5,14 @@ # Translators: # <gsanky+transifex(a)gmail.com>, 2011. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# <mazelm(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-11-19 10:28+0000\n" -"Last-Translator: Sanky <gsanky+transifex(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-02 22:44+0000\n" +"Last-Translator: Mirek2 <mazelm(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: lib/gettor/i18n.py:29 msgid "Thank you for your request." -msgstr "" +msgstr "Děkujeme za vaší žádost." #: lib/gettor/i18n.py:31 msgid "" @@ -33,6 +34,8 @@ msgid "" "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n" "one of those." msgstr "" +"Naneštěstí Vám neodpovíme na tuto adresu. Měli byste si vytvořit účet na " +"GMAIL.COM, YAHOO.COM či YAHOO.CN a odeslat mail z něj." #: lib/gettor/i18n.py:35 msgid "" @@ -72,18 +75,31 @@ msgid "" " linux-x86_64\n" " source" msgstr "" +"Pošlu Vám Tor balíček, když mi řeknete, jaký chcete.\n" +"Prosím vyberte jeden z následujících jmen balíčků:\n" +"\n" +" windows\n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" #: lib/gettor/i18n.py:56 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." msgstr "" +"Prosím odpovězte na tento e-mail a zmiňte jméno jednoho balíčku kdekoliv v " +"e-mailu." #: lib/gettor/i18n.py:59 msgid "" "OBTAINING LOCALIZED VERSIONS OF TOR\n" "===================================" msgstr "" +"ZÍSKÁVÁM LOKALIZOVANÉ VERZE TORU\n" +"===================================" #: lib/gettor/i18n.py:62 msgid "" @@ -92,6 +108,9 @@ msgid "" "\n" " gettor+fa(a)torproject.org" msgstr "" +"Abyste obdržel(a) verzi Toru přeloženou do Vašeho jazyku, specifikujte jazyk, který chcete, v adrese na kterou mail pošlete:\n" +"\n" +" gettor+fa(a)torproject.org" #: lib/gettor/i18n.py:67 msgid "" @@ -143,6 +162,8 @@ msgid "" "SMALLER SIZED PACKAGES\n" "======================" msgstr "" +"MENŠÍ BALÍČKY\n" +"======================" #: lib/gettor/i18n.py:92 msgid "" @@ -221,6 +242,8 @@ msgid "" "SUPPORT\n" "=======" msgstr "" +"PODPORA\n" +"=======" #: lib/gettor/i18n.py:133 msgid "" @@ -258,6 +281,8 @@ msgid "" "BLOCKED ACCESS / CENSORSHIP\n" "===========================" msgstr "" +"ZABLOKOVANÝ PŘÍSTUP / CENZURA\n" +"===========================" #: lib/gettor/i18n.py:155 msgid "" @@ -343,6 +368,8 @@ msgid "" "UNPACKING THE FILES\n" "===================" msgstr "" +"ROZBALUJI SOUBORY\n" +"===================" #: lib/gettor/i18n.py:196 msgid "" @@ -352,6 +379,13 @@ msgid "" "\n" " http://www.7-zip.org/" msgstr "" +"Nejjednodušší způsob, jak rozbalit soubory, které jste obdržel(a)\n" +"\n" +"The easiest way to unpack the files you received is to install 7-Zip,\n" +"a free file compression/uncompression tool. If it isn't installed on\n" +"your computer yet, you can download it here:\n" +"\n" +" http://www.7-zip.org/" #: lib/gettor/i18n.py:202 msgid ""

1 0

[torflow/master] Use FastFirstHopPK to get circ fail rates for Guards.
by mikeperry＠torproject.org 02 Dec '11

02 Dec '11

commit 8684b9588d60a05fed11c83380540c0a8abbf6ca Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 2 14:16:00 2011 -0800 Use FastFirstHopPK to get circ fail rates for Guards. Otherwise we might not detect CPU overload conditions in them. --- NetworkScanners/BwAuthority/data/tor/torrc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/data/tor/torrc b/NetworkScanners/BwAuthority/data/tor/torrc index 0c13322..c64273b 100644 --- a/NetworkScanners/BwAuthority/data/tor/torrc +++ b/NetworkScanners/BwAuthority/data/tor/torrc @@ -12,3 +12,7 @@ __LeaveStreamsUnattached 1 # Bad idea? Too much consensus update activity? FetchDirInfoExtraEarly 1 FetchDirInfoEarly 1 + +# Use CREATE cells for first hop, so we can still measure CPU overload via +# circ failure +FastFirstHopPK 0

1 0

[tor/master] Don't just tell the controller "foo" on id mismatch
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 682a85ff7c691f691f9f7745e34e396f15e5d601 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:27:33 2011 -0500 Don't just tell the controller "foo" on id mismatch Fixes bug 4169; bugfix on 0.2.1.1-alpha. --- changes/bug4169 | 6 ++++++ src/or/connection_or.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/changes/bug4169 b/changes/bug4169 new file mode 100644 index 0000000..38c18d3 --- /dev/null +++ b/changes/bug4169 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Report a real bootstrap problem to the controller on router + identity mismatch. Previously we just said "foo", which probably + made a lot of sense at the time. Fixes bug 4169; bugfix on + 0.2.1.1-alpha. + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 470f6d2..b865e13 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1514,7 +1514,9 @@ connection_or_client_learned_peer_id(or_connection_t *conn, control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, END_OR_CONN_REASON_OR_IDENTITY); if (!authdir_mode_tests_reachability(options)) - control_event_bootstrap_problem("foo", END_OR_CONN_REASON_OR_IDENTITY); + control_event_bootstrap_problem( + "Unexpected identity in router certificate", + END_OR_CONN_REASON_OR_IDENTITY); as_expected = 0; } if (authdir_mode_tests_reachability(options)) {

1 0

[tor/master] Init conn->addr to "unspec" on cpuworker connections
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 5303918091d832d2986b113d60a6ba1ca328af1c Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:21:50 2011 -0500 Init conn->addr to "unspec" on cpuworker connections Fixes bug 4532 reported by "troll_un" --- changes/bug4532 | 3 +++ src/or/cpuworker.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4532 b/changes/bug4532 new file mode 100644 index 0000000..6ce4881 --- /dev/null +++ b/changes/bug4532 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Initialize conn->addr to a vaild state in spawn_cpuworker. Fixes bug + 4532; found by troll_un. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index 9140037..e4460c5 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -347,6 +347,7 @@ spawn_cpuworker(void) /* set up conn so it's got all the data we need to remember */ conn->s = fd; conn->address = tor_strdup("localhost"); + tor_addr_make_unspec(&conn->addr); if (connection_add(conn) < 0) { /* no space, forget it */ log_warn(LD_NET,"connection_add for cpuworker failed. Giving up.");

1 0

[tor/master] Don't call tor_tls_set_logged_address till after checking conn->tls
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 6171bdd1056e3511b1842ac8a3e17aa349616075 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:15:52 2011 -0500 Don't call tor_tls_set_logged_address till after checking conn->tls Fixes bug 4531; partial backport of e27a26d5. --- changes/bug4531 | 4 ++++ src/or/connection_or.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug4531 b/changes/bug4531 new file mode 100644 index 0000000..6209f9a --- /dev/null +++ b/changes/bug4531 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1fffba7..dc8850e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -871,12 +871,12 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) { conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, // XXX client and relay? - escaped_safe_str(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; } + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str(conn->_base.address)); connection_start_reading(TO_CONN(conn)); log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s); note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 57ff9913b25ff640f4ae45dc9b60bc28c30f53b8 Merge: d9edee3 6171bdd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:17:52 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/connection_or.c The conflict in src/or/connection_or.c is resolved by taking the version in master, since e27a26d5 already fixed bug 4531 on master. This merge just adds the changes file from 0.2.2. changes/bug4531 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Don't call tor_tls_set_logged_address till after checking conn->tls
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 6171bdd1056e3511b1842ac8a3e17aa349616075 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:15:52 2011 -0500 Don't call tor_tls_set_logged_address till after checking conn->tls Fixes bug 4531; partial backport of e27a26d5. --- changes/bug4531 | 4 ++++ src/or/connection_or.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug4531 b/changes/bug4531 new file mode 100644 index 0000000..6209f9a --- /dev/null +++ b/changes/bug4531 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix null-pointer access that could occur if TLS allocation failed. + Fixes bug 4531; bugfix on 0.2.0.20-rc. Found by "troll_un". + diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 1fffba7..dc8850e 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -871,12 +871,12 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) { conn->_base.state = OR_CONN_STATE_TLS_HANDSHAKING; conn->tls = tor_tls_new(conn->_base.s, receiving); - tor_tls_set_logged_address(conn->tls, // XXX client and relay? - escaped_safe_str(conn->_base.address)); if (!conn->tls) { log_warn(LD_BUG,"tor_tls_new failed. Closing."); return -1; } + tor_tls_set_logged_address(conn->tls, // XXX client and relay? + escaped_safe_str(conn->_base.address)); connection_start_reading(TO_CONN(conn)); log_debug(LD_HANDSHAKE,"starting TLS handshake on fd %d", conn->_base.s); note_crypto_pk_op(receiving ? TLS_HANDSHAKE_S : TLS_HANDSHAKE_C);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit d9edee3a3b98eaae5192f1307197d1a33122ec61 Merge: f78fc8c 2b5a035 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:10:17 2011 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --cc src/common/compat.c index ea95f9f,a4e5074..33e2864 --- a/src/common/compat.c +++ b/src/common/compat.c @@@ -979,19 -934,10 +979,19 @@@ tor_open_socket(int domain, int type, i /** As socket(), but counts the number of open sockets. */ tor_socket_t - tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) + tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { - tor_socket_t s = accept(sockfd, addr, len); + tor_socket_t s; +#if defined(HAVE_ACCEPT4) && defined(SOCK_CLOEXEC) +#define LINUX_CLOEXEC_ACCEPT + s = accept4(sockfd, addr, len, SOCK_CLOEXEC); +#else + s = accept(sockfd, addr, len); +#endif if (SOCKET_OK(s)) { +#if !defined(LINUX_CLOEXEC_ACCEPT) && defined(FD_CLOEXEC) + fcntl(s, F_SETFD, FD_CLOEXEC); +#endif socket_accounting_lock(); ++n_sockets_open; mark_socket_open(s);

1 0

[tor/master] tor_accept_socket() should take tor_addr_t for listener arg
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 2b5a0356047e7622c66e434cd8ac4a7689d4cc28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:09:16 2011 -0500 tor_accept_socket() should take tor_addr_t for listener arg Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un" --- changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug4535 b/changes/bug4535 new file mode 100644 index 0000000..57ced29 --- /dev/null +++ b/changes/bug4535 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Use tor_socket_t type for listener argument to accept(). Fixes bug + 4535; bugfix on 0.2.2.28-beta. Found by "troll_un". diff --git a/src/common/compat.c b/src/common/compat.c index 266fc61..a4e5074 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -934,7 +934,7 @@ tor_open_socket(int domain, int type, int protocol) /** As socket(), but counts the number of open sockets. */ tor_socket_t -tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) +tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { tor_socket_t s = accept(sockfd, addr, len); if (SOCKET_OK(s)) { diff --git a/src/common/compat.h b/src/common/compat.h index 011b9c8..3e1b5b8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -404,7 +404,7 @@ typedef int socklen_t; int tor_close_socket(tor_socket_t s); tor_socket_t tor_open_socket(int domain, int type, int protocol); -tor_socket_t tor_accept_socket(int sockfd, struct sockaddr *addr, +tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); int get_n_open_sockets(void);

1 0

[tor/maint-0.2.2] tor_accept_socket() should take tor_addr_t for listener arg
by nickm＠torproject.org 02 Dec '11

02 Dec '11

commit 2b5a0356047e7622c66e434cd8ac4a7689d4cc28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:09:16 2011 -0500 tor_accept_socket() should take tor_addr_t for listener arg Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un" --- changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug4535 b/changes/bug4535 new file mode 100644 index 0000000..57ced29 --- /dev/null +++ b/changes/bug4535 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Use tor_socket_t type for listener argument to accept(). Fixes bug + 4535; bugfix on 0.2.2.28-beta. Found by "troll_un". diff --git a/src/common/compat.c b/src/common/compat.c index 266fc61..a4e5074 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -934,7 +934,7 @@ tor_open_socket(int domain, int type, int protocol) /** As socket(), but counts the number of open sockets. */ tor_socket_t -tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) +tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { tor_socket_t s = accept(sockfd, addr, len); if (SOCKET_OK(s)) { diff --git a/src/common/compat.h b/src/common/compat.h index 011b9c8..3e1b5b8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -404,7 +404,7 @@ typedef int socklen_t; int tor_close_socket(tor_socket_t s); tor_socket_t tor_open_socket(int domain, int type, int protocol); -tor_socket_t tor_accept_socket(int sockfd, struct sockaddr *addr, +tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); int get_n_open_sockets(void);

1 0