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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 11 Nov '13

11 Nov '13

commit ed0ce4587ef69c9989f5f84614c73cc5640243b4 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 23:45:59 2013 +0000 Update translations for liveusb-creator --- el/el.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/el/el.po b/el/el.po index c14dc56..8b61ca9 100644 --- a/el/el.po +++ b/el/el.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# pappasadrian <pappasadrian(a)gmail.com>, 2013 # dpdt1 <dpdt1(a)espiv.net>, 2013 # anvo <fragos.george(a)hotmail.com>, 2012 # jcbgr <jcbgr(a)yahoo.co.uk>, 2012 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-06 09:28+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-10 23:45+0000\n" +"Last-Translator: pappasadrian <pappasadrian(a)gmail.com>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/torproject/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,7 +280,7 @@ msgstr "Μόνιμη Αποθήκευση (0 MB)" #: ../liveusb/gui.py:697 ../liveusb/gui.py:726 msgid "Please confirm your device selection" -msgstr "" +msgstr "Παρακαλώ επιβεβαιώστε την επιλογή συσκευής" #: ../liveusb/gui.py:462 msgid "Refreshing releases..."

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 11 Nov '13

11 Nov '13

commit 4f8548bfb0283b1a4d269b6647bcbe4642f7eaa7 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 23:45:57 2013 +0000 Update translations for https_everywhere_completed --- el/https-everywhere.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd index d609fde..ad2e1a6 100644 --- a/el/https-everywhere.dtd +++ b/el/https-everywhere.dtd @@ -34,4 +34,9 @@ <!ENTITY https-everywhere.source.filename "Όνομα αρχείου"> <!ENTITY https-everywhere.source.unable_to_download "Αδυναμί λήψης πηγαίου κώδικα."> - +<!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 ειδοποίηση"> +<!ENTITY https-everywhere.popup.paragraph1 "Ωχ. Χρησιμοποιούσατε τη σταθερή έκδοση του HTTPS Everywhere, αλλά μπορεί κατά λάθος να σας αναβαθμίσαμε στην δοκιμαστική έκδοση κατά τη τελευταία ενημέρωση."> +<!ENTITY https-everywhere.popup.paragraph2 "Θα θέλατε να πάτε πίσω στη σταθερή έκδοση;"> +<!ENTITY https-everywhere.popup.paragraph3 "Θα μας άρεσε πραγματικά αν συνεχίζατε να χρησιμοποιείτε την έκδοση ανάπτυξης, βοηθώντας μας να κάνουμε το HTTPS Everywhere καλύτερο! Ίσως βρείτε μερικά σφάλματα εδώ και εκεί, τα οποία μπορείτε να αναφέρετε στο https-everywhere(a)eff.org. Συγγνώμη για την τυχόν ταλαιπωρία, και ευχαριστούμε που χρησιμοποιείτε το HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.keep "Αφήστε με, με τη δοκιμαστική έκδοση"> +<!ENTITY https-everywhere.popup.revert "Μεταφόρτωση της τελευταίας σταθερής έκδοσης">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 11 Nov '13

11 Nov '13

commit 2bbd885979673dfd954ece172b31943fb142b9c8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 23:45:50 2013 +0000 Update translations for https_everywhere --- el/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/https-everywhere.dtd b/el/https-everywhere.dtd index 92abc43..ad2e1a6 100644 --- a/el/https-everywhere.dtd +++ b/el/https-everywhere.dtd @@ -37,6 +37,6 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 ειδοποίηση"> <!ENTITY https-everywhere.popup.paragraph1 "Ωχ. Χρησιμοποιούσατε τη σταθερή έκδοση του HTTPS Everywhere, αλλά μπορεί κατά λάθος να σας αναβαθμίσαμε στην δοκιμαστική έκδοση κατά τη τελευταία ενημέρωση."> <!ENTITY https-everywhere.popup.paragraph2 "Θα θέλατε να πάτε πίσω στη σταθερή έκδοση;"> -<!ENTITY https-everywhere.popup.paragraph3 ""> +<!ENTITY https-everywhere.popup.paragraph3 "Θα μας άρεσε πραγματικά αν συνεχίζατε να χρησιμοποιείτε την έκδοση ανάπτυξης, βοηθώντας μας να κάνουμε το HTTPS Everywhere καλύτερο! Ίσως βρείτε μερικά σφάλματα εδώ και εκεί, τα οποία μπορείτε να αναφέρετε στο https-everywhere(a)eff.org. Συγγνώμη για την τυχόν ταλαιπωρία, και ευχαριστούμε που χρησιμοποιείτε το HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Αφήστε με, με τη δοκιμαστική έκδοση"> <!ENTITY https-everywhere.popup.revert "Μεταφόρτωση της τελευταίας σταθερής έκδοσης">

1 0

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

10 Nov '13

commit 8e616f1fa784e72b68f3fa9773afde5ac827007d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 21:45:03 2013 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po index 620d7f8..af84386 100644 --- a/ro/LC_MESSAGES/bridgedb.po +++ b/ro/LC_MESSAGES/bridgedb.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-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-11-10 21:13+0000\n" +"PO-Revision-Date: 2013-11-10 21:30+0000\n" "Last-Translator: Simona Trifoi <adrianatrifoi(a)gmail.com>\n" "Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" "MIME-Version: 1.0\n" @@ -44,7 +44,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -71,7 +71,7 @@ msgstr "" #: lib/bridgedb/templates/captcha.html:8 msgid "Type the two words" -msgstr "" +msgstr "Introduceți cele două cuvinte" #: lib/bridgedb/templates/index.html:6 msgid "Step 1" @@ -84,7 +84,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:13 msgid "Step 2" -msgstr "" +msgstr "Pasul 2" #: lib/bridgedb/templates/index.html:15 #, python-format @@ -93,7 +93,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:19 msgid "Step 3" -msgstr "" +msgstr "Pasul 3" #: lib/bridgedb/templates/index.html:21 #, python-format

1 0

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

10 Nov '13

commit 9f8ed48a53869ddf26559de7676f6937c2dae745 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 21:16:07 2013 +0000 Update translations for torbirdy --- ro/torbirdy.dtd | 2 +- ro/torbirdy.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ro/torbirdy.dtd b/ro/torbirdy.dtd index 2ea565d..c03f6d1 100644 --- a/ro/torbirdy.dtd +++ b/ro/torbirdy.dtd @@ -14,7 +14,7 @@ <!ENTITY torbirdy.prefs.cancel.button "Revocare"> <!ENTITY torbirdy.prefs.extra2.button "Restaurează setările implicite"> <!ENTITY torbirdy.prefs.extra2.key "d"> -<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> +<!ENTITY torbirdy.prefs.testproxy.button "Testează setările Proxy"> <!ENTITY torbirdy.prefs.testproxy.key "p"> <!ENTITY torbirdy.prefs.proxy.label "Proxy"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> diff --git a/ro/torbirdy.properties b/ro/torbirdy.properties index 005e93b..da0e254 100644 --- a/ro/torbirdy.properties +++ b/ro/torbirdy.properties @@ -7,9 +7,9 @@ torbirdy.enabled.custom=TorBirdy Activat: Proxy Personalizat torbirdy.enabled.whonix=TorBirdy Activat: Whonix torbirdy.disabled=TorBirdy: Dezactivat! -# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually. +torbirdy.email.prompt=TorBirdy a dezactivat expertul configurație automată pentru a vă proteja anonimatul.\n\nSetările de securitate recomandate pentru %S au fost stabilite.\n\nPuteți acum configura manual setările celuilalt cont. -# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing. +torbirdy.email.advanced=Vă rugăm să luați la cunoștință faptul că schimbând setările avansate ale lui TorBirdy NU este recomandat.\n\nAr trebui să continuați doar în cazul în care sunteți sigur de ceea ce faceți. torbirdy.email.advanced.nextwarning=Arată această notificare data viitoare torbirdy.email.advanced.title=Setări Avansate TorBirdy

1 0

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

10 Nov '13

commit 718a91eccf990dd2f4744cb055d70ab51999db04 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 21:15:02 2013 +0000 Update translations for bridgedb --- ro/LC_MESSAGES/bridgedb.po | 101 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..620d7f8 --- /dev/null +++ b/ro/LC_MESSAGES/bridgedb.po @@ -0,0 +1,101 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# Simona Trifoi <adrianatrifoi(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-03-27 21:41+0000\n" +"PO-Revision-Date: 2013-11-10 21:13+0000\n" +"Last-Translator: Simona Trifoi <adrianatrifoi(a)gmail.com>\n" +"Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Ce sunt punțile? " + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "" + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "" + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "" + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "" + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr ""

1 0

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

10 Nov '13

commit a2fa4636b170ec9b01b4a02e6b20a6b265ee159f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 20:46:08 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 ade2cdf..231ab2c 100644 --- a/ro/torlauncher.properties +++ b/ro/torlauncher.properties @@ -1,7 +1,7 @@ ### Copyright (c) 2013, The Tor Project, Inc. ### See LICENSE for licensing information. -# torlauncher.error_title=Tor Launcher +torlauncher.error_title=Lansator Tor # torlauncher.tor_exited=Tor unexpectedly exited. # torlauncher.please_restart_app=Please restart this application.

1 0

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

10 Nov '13

commit 15b710cc576cbcc8df07b3aad636e785542206a5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 10 20:46:00 2013 +0000 Update translations for torbirdy --- ro/torbirdy.dtd | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ro/torbirdy.dtd b/ro/torbirdy.dtd index e46d0e4..2ea565d 100644 --- a/ro/torbirdy.dtd +++ b/ro/torbirdy.dtd @@ -10,16 +10,16 @@ <!ENTITY torbirdy.prefs.title "Setări TorBirdy"> <!ENTITY torbirdy.prefs.save.button "Salvează"> -<!ENTITY torbirdy.prefs.save.key ""> +<!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Revocare"> <!ENTITY torbirdy.prefs.extra2.button "Restaurează setările implicite"> <!ENTITY torbirdy.prefs.extra2.key "d"> -<!ENTITY torbirdy.prefs.testproxy.button ""> +<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY torbirdy.prefs.testproxy.key "p"> -<!ENTITY torbirdy.prefs.proxy.label ""> -<!ENTITY torbirdy.prefs.privacy.label ""> -<!ENTITY torbirdy.prefs.enigmail.label ""> -<!ENTITY torbirdy.prefs.security.label ""> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "Privacy"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> +<!ENTITY torbirdy.prefs.security.label "Security"> <!ENTITY torbirdy.prefs.recommended.text "Folosește setările proxy recomandate pentru TorBirdy (Tor)"> <!ENTITY torbirdy.prefs.recommended.key "r"> <!ENTITY torbirdy.prefs.anonservice.text "Alege un serviciu de anonimizare"> @@ -27,37 +27,37 @@ <!ENTITY torbirdy.prefs.customsettings.text "Folosește setări individualizate pentru proxy"> <!ENTITY torbirdy.prefs.customsettings.key "p"> <!ENTITY torbirdy.prefs.socks_host.label "Host SOCKS:"> -<!ENTITY torbirdy.prefs.socks_host.key ""> +<!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "Port:"> <!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label ""> -<!ENTITY torbirdy.prefs.torification.key ""> +<!ENTITY torbirdy.prefs.torification.label "Transparent Torification (warning: requires custom transproxy or Tor router)"> +<!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "Global"> <!ENTITY torbirdy.prefs.imap.label "Activează supportul pentru push email pentru conturile IMAP [implicit: dezactivat]"> <!ENTITY torbirdy.prefs.imap.key "p"> -<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> <!ENTITY torbirdy.prefs.startup_folder.key "p"> <!ENTITY torbirdy.prefs.timezone.label "Nu seta fusul orar în Thunderbird la UTC [implicit: setează la UTC]"> <!ENTITY torbirdy.prefs.timezone.key "p"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label ""> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "Do not put the recipient key IDs into encrypted messages [default: put]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.confirmemail.label ""> -<!ENTITY torbirdy.prefs.confirmemail.key ""> -<!ENTITY torbirdy.prefs.emailwizard.label ""> +<!ENTITY torbirdy.prefs.confirmemail.label "Confirm before sending email if Enigmail is enabled [default: do not confirm]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "Enable Thunderbird's automatic email configuration wizard [default: disabled]"> <!ENTITY torbirdy.prefs.emailwizard.key "p"> -<!ENTITY torbirdy.prefs.automatic.label ""> -<!ENTITY torbirdy.prefs.automatic.key ""> -<!ENTITY torbirdy.prefs.renegotiation.label ""> +<!ENTITY torbirdy.prefs.automatic.label "Check for new messages automatically for all accounts [default: disabled]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.renegotiation.label "Allow connections to servers that do not support SSL/TLS with secure renegotiation [default: do not allow]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> -<!ENTITY torbirdy.prefs.account_specific ""> +<!ENTITY torbirdy.prefs.account_specific "Account-Specific"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "Alege un cont:"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> -<!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Folosește Tor Onion Router"> <!ENTITY torbirdy.panel.usejondo.label "Folosește JonDo (Premium)"> <!ENTITY torbirdy.panel.usewhonix.label "Folosește Whonix"> <!ENTITY torbirdy.panel.preferences.label "Deschide pagina de setări TorBirdy"> -<!ENTITY torbirdy.firstrun.title ""> +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">

1 0

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

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