tor-commits September 2013

tor-commits@lists.torproject.org

17 participants
1101 discussions

[tor/maint-0.2.4] 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

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit e7c57a2c5ea6655a3a3a8f706ebf347440aded0c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 19:16:40 2013 +0000 Update translations for tor-launcher-network-settings --- sk_SK/network-settings.dtd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd index 9091cd2..261c500 100644 --- a/sk_SK/network-settings.dtd +++ b/sk_SK/network-settings.dtd @@ -10,18 +10,18 @@ <!ENTITY torSettings.firstQuestion "Ktorá z nasledujúcich situácií najlepšie popisuje Vašu?"> <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 "Potrebujem konfigurovať nastavenia siete. "> -<!ENTITY torSettings.configure "Nastaviť"> +<!ENTITY torSettings.configure "Konfigurovať"> <!ENTITY torSettings.connectPrompt1 ""> <!ENTITY torSettings.connectPrompt2 "Rád by som sa pripojil priamo do siete Tor."> <!ENTITY torSettings.connect "Pripojiť"> <!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač použiť proxy pre prístup na internet?">  -<!ENTITY torSettings.proxyHelp ""> +<!ENTITY torSettings.proxyHelp "Ak si nie ste istý odpoveďou na túto otázku, pozrite na nastavenie internetu v inom prehliadači, či je konfigurovaný pre použitie proxy."> <!ENTITY torSettings.enterProxy ""> <!ENTITY torSettings.firewallQuestion ""> <!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> +<!ENTITY torSettings.enterFirewall "Zadajte čísla portov oddelené medzerou, ktoré sú povolené na firewalle."> <!ENTITY torSettings.bridgeQuestion "">  @@ -30,8 +30,8 @@ <!ENTITY torsettings.optional "Voliteľne"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "Tento počítač potrebuje použiť proxy pre prístup na internet"> +<!ENTITY torsettings.useProxy.type "Typ proxy:"> <!ENTITY torsettings.useProxy.address "Adresa:"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo hostname"> <!ENTITY torsettings.useProxy.port "Port:"> @@ -43,10 +43,10 @@ <!ENTITY torsettings.firewall.checkbox ""> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor"> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.label "Zadaj jeden alebo viac premosťovacích relays (jednu na riadok)."> +<!ENTITY torsettings.useBridges.placeholder "adresa:port ALEBO transport adresa:port"> -<!ENTITY torsettings.copyLog "Kopírovať Tor log do schránky"> +<!ENTITY torsettings.copyLog "Kopírovať log Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> <!ENTITY torsettings.bridgeHelp2 "">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit 3416f8f6b009f2f8866a97bdb94161c23fa8ac84 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 19:16:33 2013 +0000 Update translations for tor-launcher-properties --- sk_SK/torlauncher.properties | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties new file mode 100644 index 0000000..ece8c52 --- /dev/null +++ b/sk_SK/torlauncher.properties @@ -0,0 +1,30 @@ +### Copyright (c) 2013, The Tor Project, Inc. +### See LICENSE for licensing information. + +# torlauncher.error_title=Tor Launcher + +# torlauncher.tor_exited=Tor unexpectedly exited. +# torlauncher.tor_controlconn_failed=Could not connect to Tor control port. +# torlauncher.tor_failed_to_start=Tor failed to start. +# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.\n\n%S + +# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S +# torlauncher.tor_missing=The Tor executable is missing. +# torlauncher.torrc_missing=The torrc file is missing. +# torlauncher.datadir_missing=The Tor data directory does not exist. +# torlauncher.password_hash_missing=Failed to get hashed password. + +# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S +# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S +# torlauncher.ensure_tor_is_running=Please ensure that Tor is running. + +# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. +# torlauncher.error_proxy_type_missing=You must select the proxy type. +# torlauncher.error_bridges_missing=You must specify one or more bridges. + +torlauncher.connect=Pripojiť +# torlauncher.quit=Quit +# torlauncher.quit_win=Exit +# torlauncher.done=Done + +# torlauncher.forAssistance=For assistance, contact %S

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 03 Sep '13

03 Sep '13

commit e5f261da467897d8a066977948c435f3bac601ea Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 18:46:44 2013 +0000 Update translations for tor-launcher-network-settings --- sk_SK/network-settings.dtd | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd index 7532a7f..9091cd2 100644 --- a/sk_SK/network-settings.dtd +++ b/sk_SK/network-settings.dtd @@ -4,18 +4,18 @@ <!ENTITY torsettings.prompt ""> -<!ENTITY torSettings.yes ""> -<!ENTITY torSettings.no ""> +<!ENTITY torSettings.yes "Áno"> +<!ENTITY torSettings.no "Nie"> -<!ENTITY torSettings.firstQuestion ""> +<!ENTITY torSettings.firstQuestion "Ktorá z nasledujúcich situácií najlepšie popisuje Vašu?"> <!ENTITY torSettings.configurePrompt1 ""> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> +<!ENTITY torSettings.configurePrompt2 "Potrebujem konfigurovať nastavenia siete. "> +<!ENTITY torSettings.configure "Nastaviť"> <!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> -<!ENTITY torSettings.connect ""> +<!ENTITY torSettings.connectPrompt2 "Rád by som sa pripojil priamo do siete Tor."> +<!ENTITY torSettings.connect "Pripojiť"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Potrebuje tento počítač použiť proxy pre prístup na internet?">  <!ENTITY torSettings.proxyHelp ""> <!ENTITY torSettings.enterProxy ""> @@ -26,27 +26,27 @@  -<!ENTITY torsettings.startingTor ""> +<!ENTITY torsettings.startingTor "Čakanie na štart Toru..."> -<!ENTITY torsettings.optional ""> +<!ENTITY torsettings.optional "Voliteľne"> <!ENTITY torsettings.useProxy.checkbox ""> <!ENTITY torsettings.useProxy.type ""> -<!ENTITY torsettings.useProxy.address ""> -<!ENTITY torsettings.useProxy.address.placeholder ""> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username ""> -<!ENTITY torsettings.useProxy.password ""> -<!ENTITY torsettings.useProxy.type.socks4 ""> -<!ENTITY torsettings.useProxy.type.socks5 ""> -<!ENTITY torsettings.useProxy.type.http ""> +<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo hostname"> +<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.username "Užívateľské meno:"> +<!ENTITY torsettings.useProxy.password "Heslo:"> +<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> +<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> +<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox ""> -<!ENTITY torsettings.firewall.allowedPorts ""> -<!ENTITY torsettings.useBridges.checkbox ""> +<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> +<!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor"> <!ENTITY torsettings.useBridges.label ""> <!ENTITY torsettings.useBridges.placeholder ""> -<!ENTITY torsettings.copyLog ""> +<!ENTITY torsettings.copyLog "Kopírovať Tor log do schránky"> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> <!ENTITY torsettings.bridgeHelp2 "">

1 0

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

03 Sep '13

commit ff680a3ac84bd9aad27092b3eda0fc9aa794b6f4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 18:46:27 2013 +0000 Update translations for tails-greeter --- sk_SK/sk_SK.po | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/sk_SK/sk_SK.po b/sk_SK/sk_SK.po new file mode 100644 index 0000000..06be107 --- /dev/null +++ b/sk_SK/sk_SK.po @@ -0,0 +1,138 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-05-12 19:29+0200\n" +"PO-Revision-Date: 2012-10-03 17:36+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sk_SK\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: ../glade/persistencewindow.glade.h:1 +msgid "Forward" +msgstr "" + +#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1 +msgid "Login" +msgstr "" + +#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2 +msgid "Welcome to Tails" +msgstr "" + +#: ../glade/persistencewindow.glade.h:4 +msgid "Use persistence?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:5 +msgid "Yes" +msgstr "Áno" + +#: ../glade/persistencewindow.glade.h:6 +msgid "No" +msgstr "Nie" + +#: ../glade/persistencewindow.glade.h:7 +msgid "Passphrase:" +msgstr "" + +#: ../glade/persistencewindow.glade.h:8 +msgid "Read-Only?" +msgstr "" + +#: ../glade/persistencewindow.glade.h:9 +msgid "Wrong passphrase. Please try again." +msgstr "" + +#: ../glade/persistencewindow.glade.h:10 +msgid "More options?" +msgstr "" + +#: ../glade/optionswindow.glade.h:3 +msgid "Administration password" +msgstr "" + +#: ../glade/optionswindow.glade.h:4 +msgid "" +"Enter an administration password in case you need to perform administration tasks.\n" +"Otherwise it will be disabled for better security." +msgstr "" + +#: ../glade/optionswindow.glade.h:6 +msgid "Password:" +msgstr "Heslo:" + +#: ../glade/optionswindow.glade.h:7 +msgid "Verify Password:" +msgstr "" + +#: ../glade/optionswindow.glade.h:8 +msgid "Passwords do not match" +msgstr "" + +#: ../glade/optionswindow.glade.h:9 +msgid "Windows Camouflage" +msgstr "" + +#: ../glade/optionswindow.glade.h:10 +msgid "" +"This option makes Tails look more like Microsoft Windows XP. This may be " +"useful in public places in order to avoid attracting suspicion." +msgstr "" + +#: ../glade/optionswindow.glade.h:11 +msgid "Activate Microsoft Windows XP Camouflage" +msgstr "" + +#: ../glade/langpanel.glade.h:1 +msgid " " +msgstr "" + +#: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42 +msgid "Language" +msgstr "" + +#: ../glade/langpanel.glade.h:3 +msgid "Locale" +msgstr "" + +#: ../glade/langpanel.glade.h:4 +msgid "Layout" +msgstr "" + +#: ../GdmGreeter/persistence.py:59 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:99 +#, python-format +msgid "" +"cryptsetup failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/persistence.py:124 +#, python-format +msgid "" +"live-persist failed with return code %(returncode)s:\n" +"%(stdout)s\n" +"%(stderr)s" +msgstr "" + +#: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148 +#: ../GdmGreeter/langpanel.py:181 +msgid "Other..." +msgstr ""

1 0

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

03 Sep '13

commit 55d65a421d953630033bb822b41421dd6bab11c7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 18:46:15 2013 +0000 Update translations for https_everywhere --- sk_SK/ssl-observatory.dtd | 86 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/sk_SK/ssl-observatory.dtd b/sk_SK/ssl-observatory.dtd new file mode 100644 index 0000000..d6d027d --- /dev/null +++ b/sk_SK/ssl-observatory.dtd @@ -0,0 +1,86 @@ + +<!ENTITY ssl-observatory.popup.details ""> +<!ENTITY ssl-observatory.popup.later ""> +<!ENTITY ssl-observatory.popup.no "Nie"> + +<!ENTITY ssl-observatory.popup.text ""> + + + +<!ENTITY ssl-observatory.popup.title +""> + +<!ENTITY ssl-observatory.popup.yes "Áno"> + + + +<!ENTITY ssl-observatory.prefs.adv_priv_opts1 +""> + +<!ENTITY ssl-observatory.prefs.adv_priv_opts2 +""> + +<!ENTITY ssl-observatory.prefs.alt_roots +""> + +<!ENTITY ssl-observatory.prefs.alt_roots_tooltip +""> + +<!ENTITY ssl-observatory.prefs.anonymous ""> +<!ENTITY ssl-observatory.prefs.anonymous_unavailable +""> +<!ENTITY ssl-observatory.prefs.anonymous_tooltip +""> + +<!ENTITY ssl-observatory.prefs.asn +""> + +<!ENTITY ssl-observatory.prefs.asn_tooltip +""> + +<!ENTITY ssl-observatory.prefs.done ""> + +<!ENTITY ssl-observatory.prefs.explanation +""> + + + +<!ENTITY ssl-observatory.prefs.explanation2 + +""> + +<!ENTITY ssl-observatory.prefs.hide ""> + +<!ENTITY ssl-observatory.prefs.nonanon +""> + +<!ENTITY ssl-observatory.prefs.nonanon_tooltip +""> + +<!ENTITY ssl-observatory.prefs.priv_dns +""> + +<!ENTITY ssl-observatory.prefs.priv_dns_tooltip +""> + +<!ENTITY ssl-observatory.prefs.show ""> + +<!ENTITY ssl-observatory.prefs.title ""> + +<!ENTITY ssl-observatory.prefs.use ""> +<!ENTITY ssl-observatory.warning.title ""> +<!ENTITY ssl-observatory.warning.showcert ""> +<!ENTITY ssl-observatory.warning.okay ""> +<!ENTITY ssl-observatory.warning.text ""> +<!ENTITY ssl-observatory.warning.defense ""> + +<!ENTITY ssl-observatory.prefs.self_signed +""> +<!ENTITY ssl-observatory.prefs.self_signed_tooltip +"">

1 0

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

03 Sep '13

commit 78ddeababc8b6e5c96371f4aa8eb3bc32cc47dfb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 18:45:27 2013 +0000 Update translations for vidalia_alpha --- sk_SK/vidalia_sk_SK.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sk_SK/vidalia_sk_SK.po b/sk_SK/vidalia_sk_SK.po index 8d54094..3f37c09 100644 --- a/sk_SK/vidalia_sk_SK.po +++ b/sk_SK/vidalia_sk_SK.po @@ -86,7 +86,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Address:" -msgstr "" +msgstr "Adresa:" msgctxt "AdvancedPage" msgid "None" @@ -2569,11 +2569,11 @@ msgstr "Nastavenia proxy" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "Užívateľské meno:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "Heslo:" msgctxt "NetworkPage" msgid "Port:" @@ -2593,7 +2593,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "" +msgstr "Povolené porty:" msgctxt "NetworkPage" msgid "80, 443" @@ -2649,7 +2649,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adresa:" msgctxt "NetworkPage" msgid "Type:" @@ -2661,15 +2661,15 @@ msgstr "" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -3794,11 +3794,11 @@ msgstr "Zrušiť" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "Áno" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "Nie" msgctxt "VMessageBox" msgid "Help"

1 0

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

03 Sep '13

commit c9139613f1b5430c45dd5505ec8d9b03dfe0b1d8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 18:45:19 2013 +0000 Update translations for vidalia --- sk_SK/vidalia_sk_SK.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sk_SK/vidalia_sk_SK.po b/sk_SK/vidalia_sk_SK.po index 0e4b9d5..7fa99c1 100644 --- a/sk_SK/vidalia_sk_SK.po +++ b/sk_SK/vidalia_sk_SK.po @@ -86,7 +86,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Address:" -msgstr "" +msgstr "Adresa:" msgctxt "AdvancedPage" msgid "None" @@ -2584,11 +2584,11 @@ msgstr "Nastavenia proxy" msgctxt "NetworkPage" msgid "Username:" -msgstr "" +msgstr "Užívateľské meno:" msgctxt "NetworkPage" msgid "Password:" -msgstr "" +msgstr "Heslo:" msgctxt "NetworkPage" msgid "Port:" @@ -2608,7 +2608,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Allowed Ports:" -msgstr "" +msgstr "Povolené porty:" msgctxt "NetworkPage" msgid "80, 443" @@ -2664,7 +2664,7 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adresa:" msgctxt "NetworkPage" msgid "Type:" @@ -2676,15 +2676,15 @@ msgstr "" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -3707,11 +3707,11 @@ msgstr "Zrušiť" msgctxt "VMessageBox" msgid "Yes" -msgstr "" +msgstr "Áno" msgctxt "VMessageBox" msgid "No" -msgstr "" +msgstr "Nie" msgctxt "VMessageBox" msgid "Help"

1 0

[tor/master] Fix some "ISO C90 forbids mixed declarations and code" warnings
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 5c9008e0b077e79297a5245573675d95a1f266cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 3 13:39:31 2013 -0400 Fix some "ISO C90 forbids mixed declarations and code" warnings --- src/or/directory.c | 2 +- src/test/test_dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 099df50..815e0ab 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1418,10 +1418,10 @@ parse_http_url(const char *headers, char **url) /* Check if the header is well formed (next sequence * should be HTTP/1.X\r\n). Assumes we're supporting 1.0? */ - char *e = (char *)eat_whitespace_no_nl(s); { unsigned minor_ver; char ch; + char *e = (char *)eat_whitespace_no_nl(s); if (2 != tor_sscanf(e, "HTTP/1.%u%c", &minor_ver, &ch)) { return -1; } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 0292cbd..94d1284 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2367,8 +2367,8 @@ test_dir_fmt_control_ns(void *arg) static void test_dir_http_handling(void *args) { - (void)args; char *url = NULL; + (void)args; /* Parse http url tests: */ /* Good headers */

1 0

[tor/master] MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341.
by nickm＠torproject.org 03 Sep '13

03 Sep '13

commit 0513643317db56b3bb86c0e754ac65b8ad9b803c Author: Kevin Butler <haqkrs(a)gmail.com> Date: Sat Aug 31 04:49:04 2013 +0100 MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341. --- changes/bug4341 | 2 ++ src/or/config.c | 44 ++++++++++++++++++++++++++++++++++++++------ src/test/test_config.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 6 deletions(-) diff --git a/changes/bug4341 b/changes/bug4341 new file mode 100644 index 0000000..8853a86 --- /dev/null +++ b/changes/bug4341 @@ -0,0 +1,2 @@ +o Minor bugfix: + - Config now handles fingerprints which are missing their initial '$' diff --git a/src/or/config.c b/src/or/config.c index e746da2..2792f14 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -521,7 +521,7 @@ static int options_transition_affects_workers( const or_options_t *old_options, const or_options_t *new_options); static int options_transition_affects_descriptor( const or_options_t *old_options, const or_options_t *new_options); -static int check_nickname_list(const char *lst, const char *name, char **msg); +static int check_nickname_list(const char **lst, const char *name, char **msg); static int parse_client_transport_line(const char *line, int validate_only); @@ -3090,7 +3090,7 @@ options_validate(or_options_t *old_options, or_options_t *options, "You should also make sure you aren't listing this bridge's " "fingerprint in any other MyFamily."); } - if (check_nickname_list(options->MyFamily, "MyFamily", msg)) + if (check_nickname_list((const char **)&options->MyFamily, "MyFamily", msg)) return -1; for (cl = options->NodeFamilies; cl; cl = cl->next) { routerset_t *rs = routerset_new(); @@ -3621,31 +3621,63 @@ get_default_conf_file(int defaults_file) } /** Verify whether lst is a string containing valid-looking comma-separated - * nicknames, or NULL. Return 0 on success. Warn and return -1 on failure. + * nicknames, or NULL. Will normalise lst to prefix '$' to any nickname + * or fingerprint that needs it. Return 0 on success. + * Warn and return -1 on failure. */ static int -check_nickname_list(const char *lst, const char *name, char **msg) +check_nickname_list(const char **lst, const char *name, char **msg) { int r = 0; smartlist_t *sl; + int changes = 0; - if (!lst) + if (!*lst) return 0; sl = smartlist_new(); - smartlist_split_string(sl, lst, ",", + smartlist_split_string(sl, *lst, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0); SMARTLIST_FOREACH(sl, const char *, s, { if (!is_legal_nickname_or_hexdigest(s)) { + // check if first char is dollar + if (s[0] != '$') { + // Try again but with a dollar symbol prepended + char *prepended = tor_malloc(strlen(s)+2); + strcpy(prepended, "$"); + strcat(prepended, s); + + if (is_legal_nickname_or_hexdigest(prepended)) { + // The nickname is valid when it's prepended, swap the current + // version with a prepended one + tor_free(s); + SMARTLIST_REPLACE_CURRENT(sl, s, prepended); + changes = 1; + continue; + } + + // Still not valid, free and fallback to error message + tor_free(prepended); + } + tor_asprintf(msg, "Invalid nickname '%s' in %s line", s, name); r = -1; break; } }); + + // Replace the caller's nickname list with a fixed one + if (changes && r == 0) { + const char *newNicknames = smartlist_join_strings(sl, ", ", 0, NULL); + tor_free(*lst); + *lst = newNicknames; + } + SMARTLIST_FOREACH(sl, char *, s, tor_free(s)); smartlist_free(sl); + return r; } diff --git a/src/test/test_config.c b/src/test/test_config.c index 3848d35..911913a 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -509,6 +509,41 @@ test_config_parse_transport_options_line(void *arg) } } +// Tests if an options with MyFamily fingerprints missing '$' normalises +// them correctly and also ensure it also works with multiple fingerprints +static void +test_config_fix_my_family(void *arg) +{ + char *err = NULL; + char *family = "$1111111111111111111111111111111111111111, " + "1111111111111111111111111111111111111112, " + "$1111111111111111111111111111111111111113"; + + or_options_t* options = options_new(); + or_options_t* defaults = options_new(); + options_init(options); + options_init(defaults); + options->MyFamily = tor_strdup(family); + + options_validate(NULL, options, defaults, 0, &err) ; + + if (err != NULL) { + test_fail_msg(err); + } + + test_streq(options->MyFamily, "$1111111111111111111111111111111111111111, " + "$1111111111111111111111111111111111111112, " + "$1111111111111111111111111111111111111113"); + + done: + if (err != NULL) { + tor_free(err); + } + + or_options_free(options); + or_options_free(defaults); +} + #define CONFIG_TEST(name, flags) \ { #name, test_config_ ## name, flags, NULL, NULL } @@ -518,6 +553,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(parse_transport_options_line, 0), CONFIG_TEST(check_or_create_data_subdir, TT_FORK), CONFIG_TEST(write_to_data_subdir, TT_FORK), + CONFIG_TEST(fix_my_family, 0), END_OF_TESTCASES };

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2013