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

[tor/master] Fix two more DirServer mentions in log
by nickm＠torproject.org 10 Nov '13

10 Nov '13

commit 8bfa596c152603e376b8f096a3367c1d785d6763 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:23:56 2013 -0500 Fix two more DirServer mentions in log --- src/or/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 6efd851..eabd9c3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -955,14 +955,14 @@ init_keys(void) } if (ds->type != type) { log_warn(LD_DIR, "Configured authority type does not match authority " - "type in DirServer list. Adjusting. (%d v %d)", + "type in DirAuthority list. Adjusting. (%d v %d)", type, ds->type); ds->type = type; } if (v3_digest_set && (ds->type & V3_DIRINFO) && tor_memneq(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) { log_warn(LD_DIR, "V3 identity key does not match identity declared in " - "DirServer line. Adjusting."); + "DirAuthority line. Adjusting."); memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN); }

1 0

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

10 Nov '13

commit fc5a881bd3bd635be897fafdd4f9a30d5b2bed14 Merge: e30fb0a 8bfa596 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:24:12 2013 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' doc/tor.1.txt | 5 +++-- src/or/config.c | 22 +++++++++++----------- src/or/router.c | 4 ++-- 3 files changed, 16 insertions(+), 15 deletions(-)

1 0

[tor/maint-0.2.4] Fix two more DirServer mentions in log
by nickm＠torproject.org 10 Nov '13

10 Nov '13

commit 8bfa596c152603e376b8f096a3367c1d785d6763 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:23:56 2013 -0500 Fix two more DirServer mentions in log --- src/or/router.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 6efd851..eabd9c3 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -955,14 +955,14 @@ init_keys(void) } if (ds->type != type) { log_warn(LD_DIR, "Configured authority type does not match authority " - "type in DirServer list. Adjusting. (%d v %d)", + "type in DirAuthority list. Adjusting. (%d v %d)", type, ds->type); ds->type = type; } if (v3_digest_set && (ds->type & V3_DIRINFO) && tor_memneq(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) { log_warn(LD_DIR, "V3 identity key does not match identity declared in " - "DirServer line. Adjusting."); + "DirAuthority line. Adjusting."); memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN); }

1 0

[tor/maint-0.2.4] Fix a wide line
by nickm＠torproject.org 10 Nov '13

10 Nov '13

commit 56ac75b265ccd2c5f3e16cd3584ab64c47a77f9e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:22:34 2013 -0500 Fix a wide line --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 7274b7e..3984755 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3182,8 +3182,8 @@ options_validate(or_options_t *old_options, or_options_t *options, (options->AlternateDirAuthority && options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirAuthority or both of AlternateDirAuthority " - "and AlternateBridgeAuthority configured."); + "a non-default set of DirAuthority or both of " + "AlternateDirAuthority and AlternateBridgeAuthority configured."); } if (options->AllowSingleHopExits && !options->DirAuthorities) {

1 0

[tor/maint-0.2.4] Change documentation DirServer->DirAuthority
by nickm＠torproject.org 10 Nov '13

10 Nov '13

commit 532f70a8076de227cd7f31e7bb3474f3b90d6b58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Nov 10 12:21:23 2013 -0500 Change documentation DirServer->DirAuthority We renamed the option, but we didn't actually fix it in the log messages or the docs. This patch does that. For #10124. Patch by sqrt2. --- doc/tor.1.txt | 5 +++-- src/or/config.c | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b9ee296..938ed2c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -622,7 +622,7 @@ The following options are useful only for clients (that is, if [[Bridge]] **Bridge** [__transport__] __IP__:__ORPort__ [__fingerprint__]:: When set along with UseBridges, instructs Tor to use the relay at "IP:ORPort" as a "bridge" relaying into the Tor network. If "fingerprint" - is provided (using the same format as for DirServer), we will verify that + is provided (using the same format as for DirAuthority), we will verify that the relay running at that location has the right fingerprint. We also use fingerprint to look up the bridge descriptor at the bridge authority, if it's provided and if UpdateBridgesFromAuthority is set too. + @@ -2007,7 +2007,8 @@ The following options are used for running a testing Tor network. [[TestingTorNetwork]] **TestingTorNetwork** **0**|**1**:: If set to 1, Tor adjusts default values of the configuration options below, so that it is easier to set up a testing Tor network. May only be set if - non-default set of DirServers is set. Cannot be unset while Tor is running. + non-default set of DirAuthorities is set. Cannot be unset while Tor is + running. (Default: 0) + ServerDNSAllowBrokenConfig 1 diff --git a/src/or/config.c b/src/or/config.c index 18f1c29..7274b7e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3182,7 +3182,7 @@ options_validate(or_options_t *old_options, or_options_t *options, (options->AlternateDirAuthority && options->AlternateBridgeAuthority))) { REJECT("TestingTorNetwork may only be configured in combination with " - "a non-default set of DirServer or both of AlternateDirAuthority " + "a non-default set of DirAuthority or both of AlternateDirAuthority " "and AlternateBridgeAuthority configured."); } @@ -4567,7 +4567,7 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, smartlist_split_string(items, line, NULL, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, -1); if (smartlist_len(items) < 1) { - log_warn(LD_CONFIG, "No arguments on DirServer line."); + log_warn(LD_CONFIG, "No arguments on DirAuthority line."); goto err; } @@ -4595,7 +4595,7 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, char *portstring = flag + strlen("orport="); or_port = (uint16_t) tor_parse_long(portstring, 10, 1, 65535, &ok, NULL); if (!ok) - log_warn(LD_CONFIG, "Invalid orport '%s' on DirServer line.", + log_warn(LD_CONFIG, "Invalid orport '%s' on DirAuthority line.", portstring); } else if (!strcmpstart(flag, "weight=")) { int ok; @@ -4609,13 +4609,13 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, char *idstr = flag + strlen("v3ident="); if (strlen(idstr) != HEX_DIGEST_LEN || base16_decode(v3_digest, DIGEST_LEN, idstr, HEX_DIGEST_LEN)<0) { - log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirServer line", + log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirAuthority line", flag); } else { type |= V3_DIRINFO|EXTRAINFO_DIRINFO|MICRODESC_DIRINFO; } } else { - log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirServer line", + log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirAuthority line", flag); } tor_free(flag); @@ -4627,23 +4627,23 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, type &= ~V2_DIRINFO; if (smartlist_len(items) < 2) { - log_warn(LD_CONFIG, "Too few arguments to DirServer line."); + log_warn(LD_CONFIG, "Too few arguments to DirAuthority line."); goto err; } addrport = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); if (addr_port_lookup(LOG_WARN, addrport, &address, NULL, &dir_port)<0) { - log_warn(LD_CONFIG, "Error parsing DirServer address '%s'", addrport); + log_warn(LD_CONFIG, "Error parsing DirAuthority address '%s'", addrport); goto err; } if (!dir_port) { - log_warn(LD_CONFIG, "Missing port in DirServer address '%s'",addrport); + log_warn(LD_CONFIG, "Missing port in DirAuthority address '%s'",addrport); goto err; } fingerprint = smartlist_join_strings(items, "", 0, NULL); if (strlen(fingerprint) != HEX_DIGEST_LEN) { - log_warn(LD_CONFIG, "Key digest '%s' for DirServer is wrong length %d.", + log_warn(LD_CONFIG, "Key digest '%s' for DirAuthority is wrong length %d.", fingerprint, (int)strlen(fingerprint)); goto err; } @@ -4656,7 +4656,7 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, goto err; } if (base16_decode(digest, DIGEST_LEN, fingerprint, HEX_DIGEST_LEN)<0) { - log_warn(LD_CONFIG, "Unable to decode DirServer key digest."); + log_warn(LD_CONFIG, "Unable to decode DirAuthority key digest."); goto err; }

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 10 Nov '13

10 Nov '13

commit 2cda3f304ed577f9a90ab467d594e35c9bf17ec0 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 12:15:47 2013 +0000 Update translations for whisperback --- gl/gl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gl/gl.po b/gl/gl.po index 009966b..61bee15 100644 --- a/gl/gl.po +++ b/gl/gl.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-11-10 11:44+0000\n" +"PO-Revision-Date: 2013-11-10 12:00+0000\n" "Last-Translator: pepellou <pepellou(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" @@ -162,7 +162,7 @@ msgstr "" msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr "" +msgstr "Se queres que encriptemos as mensaxes cando te respondemos, engade o teu ID de clave, unha ligazón á túa clave, ou a túa clave como un bloque de clave pública:" #: ../data/whisperback.ui.h:22 msgid "Summary" @@ -190,7 +190,7 @@ msgstr "cabeceiras" #: ../data/whisperback.ui.h:28 msgid "debugging info" -msgstr "" +msgstr "información de depuración" #: ../data/whisperback.ui.h:29 msgid "Help"

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 10 Nov '13

10 Nov '13

commit 4cbfcefee0ae7937c6bacbad1da5fef9140fdf9e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 11:46:13 2013 +0000 Update translations for tor-launcher-properties_completed --- gl/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gl/torlauncher.properties b/gl/torlauncher.properties index 57f89f1..852a16d 100644 --- a/gl/torlauncher.properties +++ b/gl/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Lanzador do Tor torlauncher.tor_exited=O Tor saíu de vez. +torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=Non se puido conectar ao porto de control do Tor. torlauncher.tor_failed_to_start=Non se puido iniciar o Tor. torlauncher.tor_bootstrap_failed=O Tor non conseguiu establecer unha conexión de rede.⏎\n⏎\n%S

1 0

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

10 Nov '13

commit 32d6c23cb37d53e613f136a3417d954ad4c7d02f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 11:46:11 2013 +0000 Update translations for tor-launcher-properties --- gl/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl/torlauncher.properties b/gl/torlauncher.properties index 2b50181..852a16d 100644 --- a/gl/torlauncher.properties +++ b/gl/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Lanzador do Tor torlauncher.tor_exited=O Tor saíu de vez. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Por favor reinicie esta aplicación. torlauncher.tor_controlconn_failed=Non se puido conectar ao porto de control do Tor. torlauncher.tor_failed_to_start=Non se puido iniciar o Tor. torlauncher.tor_bootstrap_failed=O Tor non conseguiu establecer unha conexión de rede.⏎\n⏎\n%S

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 10 Nov '13

10 Nov '13

commit c1656402604a132123fae3d1c6f84417e17573b3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 11:45:51 2013 +0000 Update translations for whisperback --- gl/gl.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gl/gl.po b/gl/gl.po index 6819a6e..009966b 100644 --- a/gl/gl.po +++ b/gl/gl.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# pepellou <pepellou(a)gmail.com>, 2013 # bulebule <luz.armas(a)udc.es>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-09-05 16:00+0000\n" -"Last-Translator: bulebule <luz.armas(a)udc.es>\n" +"PO-Revision-Date: 2013-11-10 11:44+0000\n" +"Last-Translator: pepellou <pepellou(a)gmail.com>\n" "Language-Team: Galician (http://www.transifex.com/projects/p/torproject/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgstr "Enviando mensaxe de correo electrónico" #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "" +msgstr "Esto pode levar un anaco..." #: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid." @@ -80,7 +81,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "" +msgstr "\n\nO informe de bugs non puido ser enviado, aparentemente por mor de problemas na rede. Por favor tente reconetar á rede e clique en enviar de novo.\n\nSe iso non funciona, permitiráseche gardar o informe de bugs." #: ../whisperBack/gui.py:274 msgid "Your message has been sent." @@ -104,7 +105,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "" +msgstr "O informe de bugs non puido ser enviado, aparentemente por mor de problemas na rede.\n\nComo solución provisional podes garda-lo informe como arquivo nunha memoria USB e probar a enviárno-lo a %s dende a túa conta de mail empregando outro sistema. Ten en conta que o teu informe de bugs non será anónimo ao facer así agás que tomes algunha medida máis pola túa conta (por exemplo usar Tor cunha conta de mail de usar e tirar).\n\nQueres garda-lo informe de bugs a un arquivo?" #: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack"

1 0

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

10 Nov '13

commit 544420236deb82aec887b0433369514db532f1a1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 10:16:11 2013 +0000 Update translations for tor-launcher-properties --- ro/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/torlauncher.properties b/ro/torlauncher.properties index 74f65e5..ade2cdf 100644 --- a/ro/torlauncher.properties +++ b/ro/torlauncher.properties @@ -26,6 +26,6 @@ torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri. # torlauncher.connect=Connect torlauncher.quit=Revocare torlauncher.quit_win=Ieşire -# torlauncher.done=Done +torlauncher.done=Gata # torlauncher.forAssistance=For assistance, contact %S

1 0