- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Use real_addr in send_netinfo
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 5bea660f8ebf8ec1a78c21ce5e2a6bd5dd681eed Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 22:42:10 2011 -0500 Use real_addr in send_netinfo Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349. --- changes/bug4349 | 4 ++++ src/or/connection_or.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/changes/bug4349 b/changes/bug4349 new file mode 100644 index 0000000..633916b --- /dev/null +++ b/changes/bug4349 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When sending a NETINFO cell, include the original address + received for the other side, not its canonical address. Found + by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 27a34d3..1fffba7 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1410,7 +1410,7 @@ connection_or_send_netinfo(or_connection_t *conn) /* Their address. */ out = cell.payload + 4; - len = append_address_to_payload(out, &conn->_base.addr); + len = append_address_to_payload(out, &conn->real_addr); if (len<0) return -1; out += len;

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 3bca55b376a8544ba92c7231fdf957b71f8ac5ec Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 16:15:28 2011 +0000 Update translations for vidalia_installer --- eu/vidalia_eu.po | 88 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 52 insertions(+), 36 deletions(-) diff --git a/eu/vidalia_eu.po b/eu/vidalia_eu.po index 4e55cc7..bf3db27 100755 --- a/eu/vidalia_eu.po +++ b/eu/vidalia_eu.po @@ -1,12 +1,13 @@ # # Translators: +# <baldarra(a)euskalerria.org>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: 2010-12-05 20:21+0000\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-11-15 16:14+0000\n" +"Last-Translator: baldarra <baldarra(a)euskalerria.org>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,7 +17,7 @@ msgstr "" msgctxt "BundleSetupCaption" msgid "${BUNDLE_NAME} setup" -msgstr "" +msgstr "${BUNDLE_NAME} konfiguratu" msgctxt "BundleWelcomeText" msgid "" @@ -35,11 +36,11 @@ msgstr "" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" -msgstr "" +msgstr "Ongi etorri ${BUNDLE_NAME} konfigurazio laguntzailera" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "" +msgstr "${TOR_NAME} instalazio dokumentazioa" msgctxt "BundleFinishText" msgid "" @@ -48,22 +49,28 @@ msgid "" "\n" "If you installed Torbutton, you will need to restart Firefox." msgstr "" +"Instalazioa burutu da.\n" +"Mesedez begiratu https://www.torproject.org/docs/tor-doc-windows zure aplikazioak Tor erabil dezaten nola konfiguratu behar diren ikasteko.\n" +"\n" +"Torbutton instalatu baduzu, Firefox berrabiarazi beharko duzu." msgctxt "BundleRunNow" msgid "Run installed components now" -msgstr "" +msgstr "Exekutatu instalatutako osagaiak orain" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgstr "" +"Vidalia Tor kontrolatu, jarraitu eta konfiguratzen lagunduko dizun GUI bat " +"da." msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." -msgstr "" +msgstr "Kendu ${VIDALIA_DESC}." msgctxt "VidaliaSetupCaption" msgid "${VIDALIA_NAME} setup" -msgstr "" +msgstr "${VIDALIA_NAME} konfiguratu" msgctxt "VidaliaWelcomeText" msgid "" @@ -74,35 +81,37 @@ msgstr "" msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" -msgstr "" +msgstr "Ongi etorri ${VIDALIA_NAME} konfigurazio laguntzailera" msgctxt "VidaliaLinkText" msgid "${VIDALIA_NAME} homepage" -msgstr "" +msgstr "${VIDALIA_NAME} webgunea" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgstr "" +"Vidalia Tor kontrolatu, jarraitu eta konfiguratzen lagunduko dizun GUI bat " +"da." msgctxt "VidaliaStartup" msgid "Run At Startup" -msgstr "" +msgstr "Exekutatu hasieran" msgctxt "VidaliaStartupDesc" msgid "Automatically run ${VIDALIA_NAME} at startup." -msgstr "" +msgstr "Automatikoki exekutatu ${VIDALIA_NAME} hasieran" msgctxt "VidaliaShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Gehitu Hasiera Menura" msgctxt "VidaliaShortcutsDesc" msgid "Add ${VIDALIA_NAME} to your Start menu." -msgstr "" +msgstr "${VIDALIA_NAME} zure Hasiera menura gehitzen du." msgctxt "VidaliaRunNow" msgid "Run ${VIDALIA_NAME}" -msgstr "" +msgstr "${VIDALIA_NAME} exekutatu" msgctxt "TorGroupDesc" msgid "" @@ -112,11 +121,11 @@ msgstr "" msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." -msgstr "" +msgstr "Kendu ${TOR_DESC}." msgctxt "TorAppDesc" msgid "Install ${TOR_DESC}." -msgstr "" +msgstr "Instalatu ${TOR_DESC}." msgctxt "TorAskOverwriteTorrc" msgid "" @@ -124,52 +133,57 @@ msgid "" "$\n" "Do you want to overwrite it with the default sample configuration file?" msgstr "" +"Tor ezarpen fitxategi bat duzu jada.\n" +"$\n" +"Lehenetsitako fitxategiarekin ordeztu nahi al duzu?" msgctxt "TorDocumentation" msgid "Documentation" -msgstr "" +msgstr "Dokumentazioa" msgctxt "TorDocumentationDesc" msgid "Install ${TOR_NAME} documentation." -msgstr "" +msgstr "Instalatu ${TOR_NAME} dokumentazioa." msgctxt "TorShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Gehitu Hasiera Menura" msgctxt "TorShortcutsDesc" msgid "Add ${TOR_NAME} to your Start menu." -msgstr "" +msgstr "${TOR_NAME} zure Hasiera menura gehitzen du." msgctxt "PolipoGroupDesc" msgid "" "Polipo is a caching web proxy that increases performance of web browsing " "through Tor." msgstr "" +"Polipo Tor-en bitarteko web nabigazioaren errendimendua indartzen duen web " +"proxy bat da." msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." -msgstr "" +msgstr "Kendu ${POLIPO_DESC}." msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." -msgstr "" +msgstr "Instalatu ${POLIPO_DESC}." msgctxt "PolipoShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Gehitu Hasiera Menura" msgctxt "PolipoShortcutsDesc" msgid "Add ${POLIPO_NAME} to your Start menu." -msgstr "" +msgstr "${POLIPO_NAME} zure Hasiera menura gehitzen du." msgctxt "PolipoStartup" msgid "Run At Startup" -msgstr "" +msgstr "Exekutatu hasieran" msgctxt "PolipoStartupDesc" msgid "Automatically run ${POLIPO_NAME} at startup." -msgstr "" +msgstr "Automatikoki exekutatu ${POLIPO_NAME} hasieran" msgctxt "TorbuttonGroupDesc" msgid "" @@ -179,44 +193,46 @@ msgstr "" msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." -msgstr "" +msgstr "Kendu ${TORBUTTON_DESC}." msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." -msgstr "" +msgstr "Instalatu ${TORBUTTON_DESC}." msgctxt "TorbuttonAddToFirefox" msgid "Add to Firefox" -msgstr "" +msgstr "Firefoxera gehitu" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox." -msgstr "" +msgstr "Firefoxera ${TORBUTTON_DESC} hedapena gehitu" msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton." -msgstr "" +msgstr "Firefox ez da zure sisteman aurkitu. Torbutton ez da instalatuko." msgctxt "AppData" msgid "Application Data" -msgstr "" +msgstr "Aplikazio Datuak" msgctxt "AppDataUninstDesc" msgid "Remove saved application data and configuration files." -msgstr "" +msgstr "Kendu gordetako aplikazio datuak eta ezarpen fitxategiak." msgctxt "LanguageCode" msgid "en" -msgstr "" +msgstr "en" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" -msgstr "" +msgstr "Firefox ez dago instalatuta" msgctxt "FirefoxWarningPageSubtitle" msgid "" "We recommend that you install Firefox before continuing, for best safety." msgstr "" +"Jarraitu baino lehen Firefox instala dezazun gomendatzen dizugu, segurtasun " +"hoberako." msgctxt "FirefoxWarningPageUpperText" msgid ""

1 0

[tor-cloud/master] Re-created the AMI for Tokyo, solves #4464
by runa＠torproject.org 15 Nov '11

15 Nov '11

commit f62424f38706879af00191986db4fd60bfd89fa7 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Nov 15 15:27:10 2011 +0000 Re-created the AMI for Tokyo, solves #4464 --- html/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/html/index.html b/html/index.html index 6d5d25d..4d87cc5 100644 --- a/html/index.html +++ b/html/index.html @@ -122,7 +122,7 @@ <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-94f1…" target="_blank">us-west-2 Oregon</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-65b3…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> </ul>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 167a540d02e212145acc939cb03c9328bb59b2d1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 15:15:04 2011 +0000 Update translations for tsum --- it/tsum.po | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/it/tsum.po b/it/tsum.po index 268432b..a0862b0 100644 --- a/it/tsum.po +++ b/it/tsum.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-15 14:44+0000\n" +"PO-Revision-Date: 2011-11-15 14:59+0000\n" "Last-Translator: n0on3 <a.n0on3(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -157,7 +157,7 @@ msgid "" "To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." msgstr "" "### Come ottenere Tor via email \n" -"Per ricevere il pacchetto browser Tor in lingua inglese per Windows, è sufficiente inviare una email a gettor(a)torproject.org con **windows** nel corpo del messaggio. Il titolo può essere lasciato in bianco." +"Per ricevere il Tor Browser Bundle in lingua inglese per Windows, è sufficiente inviare una email a gettor(a)torproject.org con **windows** nel corpo del messaggio. Il titolo può essere lasciato in bianco." #. type: Plain text #: en/tsum.text:57 @@ -167,7 +167,7 @@ msgid "" "**linux-x86_64** for 64-bit systems)." msgstr "" "E' inoltre possibile richiedere il Tor Browser Bundle per Mac OS X (scrivere" -" **macos-i386**), e Linux (write **linux-i386** per sistemi a 32-bit o " +" **macos-i386**), e Linux (scrivere **linux-i386** per sistemi a 32-bit o " "**linux-x86_64** per sistemi a 64-bit)." #. type: Plain text @@ -190,7 +190,7 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" -"**Nota**: Nota: I pacchetti Browser Tor per Linux e Mac OS X sono piuttosto " +"**Nota**: I pacchetti Browser Tor per Linux e Mac OS X sono piuttosto " "grandi, e non sarà possibile ricevere nessuno di questi pacchetti con Gmail," " Hotmail o Yahoo. Se non è possibile ricevere i pacchetto desiderato, si " "invii una email a help(a)rt.torproject.org per ricevere una lista di siti web " @@ -203,7 +203,7 @@ msgid "" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" "#### Come ottenere Tor sotto forma di diversi pacchetti di piccole dimensioni.\n" -"E' possibile richiedere il Pacchetto Browser Tor per Windows sotto forma di diversi pacchetti di piccole dimensioni, invece che di un unico grande pacchetto. Questo può essere utile se non si ha a disposizione molta banda, o se il fornitore di servizi email non ammette la ricezione di allegati sopra una certa dimensione." +"E' possibile richiedere il Tor Browser Bundle per Windows sotto forma di diversi pacchetti di piccole dimensioni, invece che di un unico grande pacchetto. Questo può essere utile se non si ha a disposizione molta banda, o se il fornitore di servizi email non ammette la ricezione di allegati sopra una certa dimensione." #. type: Plain text #: en/tsum.text:76 @@ -262,7 +262,7 @@ msgid "" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" "### Come controllare di avere la versione giusta\n" -"Prima di eseguire il Pacchetto Browser Tor, si dovrebbe controllare di avere la versione giusta." +"Prima di eseguire il Tor Browser Bundle, si dovrebbe controllare di avere la versione giusta." #. type: Plain text #: en/tsum.text:102 @@ -273,7 +273,7 @@ msgid "" "we intended you to get." msgstr "" "Il software che si riceve è accompagnato da un file con lo stesso nome del " -"pacchetto e con l'estensione **.asc.**. Tale .asc file è una firma GPG, e " +"pacchetto e con l'estensione **.asc**. Tale file .asc è una firma GPG, e " "permette di verificare se il file che si è scaricato è esattamente quello " "che si desiderava." @@ -467,8 +467,9 @@ msgid "" msgstr "" "Se la normale connessione ad internet funziona, ma Tor non riesce a " "connettersi alla rete, si provi quanto segue: si apra il pannello di " -"controllo di Visalia, si faccia click su *Message Log* and select the " -"*Advanced* tab. It may be that Tor won't connect because:" +"controllo di Vidalia, si faccia click su *Message Log* e si selezioni il tab" +" *Advanced*. Tor potrebbe non riuscire a connettersi per una delle seguenti " +"cause:" #. type: Plain text #: en/tsum.text:178 @@ -492,7 +493,7 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" -"**Ci si trova dietro un firewall con restrizioni**: PEr dire a Tor di " +"**Ci si trova dietro un firewall con restrizioni**: Per dire a Tor di " "provare solo con le porte 80 e 443, si aprea il pannello di controllo di " "Vidalia, si faccia click su *Settings* e *Network*, e si spunti la casella " "che dice *Il mio firewall mi permette di connettermi solo a determinate " @@ -685,7 +686,7 @@ msgid "" msgstr "" "#### Windows 7\n" "1. Aprire *Computer*\n" -"2. Fare click su *Organize* e scegliere *Folder and search options\" dal menu\n" +"2. Fare click su *Organize* e scegliere *Folder and search options* dal menu\n" "3. Fare click sulla tab *View*\n" "4. Togliere la spunta alla casella *Hide extensions for known file types* e fare click su *OK*"

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit f3cd41fd7d4e8edeac36eb1a4ba270f4e37f3570 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 14:45:05 2011 +0000 Update translations for tsum --- it/tsum.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/it/tsum.po b/it/tsum.po index 46b9b96..268432b 100644 --- a/it/tsum.po +++ b/it/tsum.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-13 21:02+0000\n" +"PO-Revision-Date: 2011-11-15 14:44+0000\n" "Last-Translator: n0on3 <a.n0on3(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -134,7 +134,7 @@ msgid "" msgstr "" "Il pacchetto raccomandato per la maggior parte degli utenti è il [Tor " "Browser Bundle](https://www.torproject.org/projects/torbrowser.html). Questo" -" pacchetto contiene un browser prevonfigurato per navigare in internet in " +" pacchetto contiene un browser preconfigurato per navigare in internet in " "modo sicuro attraverso Tor, e non richiede installazione. Tutto ciò che è " "necessario è scaricare il pacchetto, estrarre il contenuto, ed eseguire Tor."

1 0

r25222: {website} Add Czech and Italian versions of the user manual (website/trunk/docs/en)
by Runa Sandvik 15 Nov '11

15 Nov '11

Author: runa Date: 2011-11-15 12:59:22 +0000 (Tue, 15 Nov 2011) New Revision: 25222 Modified: website/trunk/docs/en/short-user-manual.wml Log: Add Czech and Italian versions of the user manual Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-11-14 21:54:03 UTC (rev 25221) +++ website/trunk/docs/en/short-user-manual.wml 2011-11-15 12:59:22 UTC (rev 25222) @@ -21,10 +21,12 @@ The user manual is available in the following languages: <ul> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_cs.xhtml">Czech</a></li> <li><a href="https://www.torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> <li><a href="https://www.torproject.org/dist/manual/short-user-manual_fr.xhtml">French</a></li> <li><a href="https://www.torproject.org/dist/manual/short-user-manual_de.xhtml">German</a></li> + <li><a href="https://www.torproject.org/dist/manual/short-user-manual_it.xhtml">Italian</a></li> <li><a href="https://www.torproject.org/dist/manual/short-user-manual_es.xhtml">Spanish</a></li> </ul>

1 0

[metrics-web/master] Add more bwauth* consensus parameters.
by karsten＠torproject.org 15 Nov '11

15 Nov '11

commit 5301457a664658f4ca889de81ef68888f94a592e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 15 11:24:41 2011 +0100 Add more bwauth* consensus parameters. --- src/org/torproject/chc/Checker.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/chc/Checker.java b/src/org/torproject/chc/Checker.java index bdd8bfd..1774a55 100644 --- a/src/org/torproject/chc/Checker.java +++ b/src/org/torproject/chc/Checker.java @@ -179,7 +179,9 @@ public class Checker { ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits," + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts," + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq," - + "cbtmintimeout,cbtinitialtimeout,bwauthpid").split(","))); + + "cbtmintimeout,cbtinitialtimeout,bwauthpid,bwauthbestratio," + + "bwauthcircs,bwauthkp,bwauthtd,bwauthti,bwauthtidecay"). + split(","))); SortedSet<String> conflicts = new TreeSet<String>(); for (Status vote : this.downloadedVotes) { Map<String, String> voteConsensusParams =

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 15 Nov '11

15 Nov '11

commit 82f018d8383124396c0e18a9973f3670d462d44b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 15 04:15:10 2011 +0000 Update translations for orbot --- values-ar/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-ca/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-de/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-es/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-fa/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-fr/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-hu/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-it/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-mk/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-nb/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-nl/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-pl/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-pt/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-ru/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-sv/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values-zh/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ values/strings.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 17 files changed, 816 insertions(+), 0 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index 5962d9c..67653f9 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -145,4 +145,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index f66ef3f..4bd44cb 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -145,4 +145,52 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index a8c9537..29b9ce6 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -146,4 +146,52 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index 47d4760..73c1cec 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -145,4 +145,52 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index 026c0c9..c2d50b5 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -135,4 +135,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 4240f0c..5fcef31 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -139,4 +139,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index d59c11d..ed55dff 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -139,4 +139,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index 1474ad0..441f928 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -140,4 +140,52 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index 4ac3b87..8fc7d5f 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -139,4 +139,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 2a75072..36911fb 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -135,4 +135,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 2d43e72..a86ceea 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -144,4 +144,52 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 5b57bb2..ca014d9 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -139,4 +139,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index 625b14a..9ed1d32 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -135,4 +135,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index c4e788f..5c32868 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -139,4 +139,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 15f4bb8..f7bea6e 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -135,4 +135,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index d72d1f0..b603e22 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -138,4 +138,52 @@ <string name="error"></string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> + <string name="exit_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> + <string name="enter_exit_nodes"></string> + <string name="exclude_nodes"></string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> + <string name="enter_exclude_nodes"></string> + <string name="strict_nodes"></string> + <string name="use_only_these_specified_nodes"></string> + <string name="bridges"></string> + <string name="use_bridges"></string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> + <string name="ip_address_and_port_of_bridges"></string> + <string name="enter_bridge_addresses"></string> + <string name="relays"></string> + <string name="relaying"></string> + <string name="enable_your_device_to_be_a_non_exit_relay"></string> + <string name="relay_port"></string> + <string name="listening_port_for_your_tor_relay"></string> + <string name="enter_or_port"></string> + <string name="relay_nickname"></string> + <string name="the_nickname_for_your_tor_relay"></string> + <string name="enter_a_custom_relay_nickname"></string> + <string name="reachable_addresses"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="reachable_ports"></string> + <string name="ports_reachable_behind_a_restrictive_firewall"></string> + <string name="enter_ports"></string> + <string name="enable_hidden_services"></string> + <string name="run_servers_accessible_via_the_tor_network"></string> + <string name="enter_localhost_ports_for_hidden_services"></string> + <string name="hidden_service_ports"></string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_"></string> + <string name="project_home"></string> + <string name="project_urls"></string> + <string name="the_tor_license"></string> + <string name="https_torproject_org"></string> + <string name="third_party_software"></string> + <string name="tor_version"></string> + <string name="libevent_version"></string> + <string name="privoxy_version"></string> + <string name="iptables_version"></string> + <string name="hidden_service_request"></string> + <string name="found_existing_tor_process"></string> + <string name="something_bad_happened"></string> + <string name="hidden_service_on"></string> + <string name="unable_to_read_hidden_service_name"></string> + <string name="unable_to_start_tor"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index 679e13e..57818fc 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -139,4 +139,52 @@ <string name="error">Error</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> + <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="exclude_nodes">Exclude Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> + <string name="enter_exclude_nodes">Enter Exclude Nodes</string> + <string name="strict_nodes">Strict Nodes</string> + <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Use Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> + <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> + <string name="enter_or_port">Enter OR port</string> + <string name="relay_nickname">Relay nickname</string> + <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> + <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="reachable_addresses">Reachable Addresses</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> + <string name="reachable_ports">Reachable ports</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> + <string name="enter_ports">Enter ports</string> + <string name="enable_hidden_services">Enable Hidden Services</string> + <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string> + <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> + <string name="hidden_service_ports">Hidden Service Ports</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> + <string name="project_home">Project Home(s): </string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">The Tor License</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">3rd-Party-Software: </string> + <string name="tor_version">Tor v0.2.3.7-alpha: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> + <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> + <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> + <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string> + <string name="found_existing_tor_process">found existing Tor process...</string> + <string name="something_bad_happened">Something bad happened. Check the log</string> + <string name="hidden_service_on">hidden service on:</string> + <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> + <string name="unable_to_start_tor">Unable to start Tor:</string> </resources>

1 0

[tor/master] Even when we can't answer an AUTH_CHALLENGE, send NETINFO.
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 325a659cb16350b1e28db803e2e673068ca2eb82 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 12:40:02 2011 -0400 Even when we can't answer an AUTH_CHALLENGE, send NETINFO. Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty". --- changes/bug4368 | 4 ++++ src/or/command.c | 25 +++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/changes/bug4368 b/changes/bug4368 new file mode 100644 index 0000000..54b4882 --- /dev/null +++ b/changes/bug4368 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - If a relay receives an AUTH_CHALLENGE it can't answer, it should + still send a NETINFO cell to allow the connection to become open. + Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty". diff --git a/src/or/command.c b/src/or/command.c index 6eb261c..5d0ebaa 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1100,7 +1100,14 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) conn->handshake_state->received_auth_challenge = 1; - if (use_type >= 0 && public_server_mode(get_options())) { + if (! public_server_mode(get_options())) { + /* If we're not a public server then we don't want to authenticate on a + connection we originated, and we already sent a NETINFO cell when we + got the CERTS cell. We have nothing more to do. */ + return; + } + + if (use_type >= 0) { log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Sending " "authentication", safe_str(conn->_base.address), conn->_base.port); @@ -1110,16 +1117,18 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) connection_mark_for_close(TO_CONN(conn)); return; } - if (connection_or_send_netinfo(conn) < 0) { - log_warn(LD_OR, "Couldn't send netinfo cell"); - connection_mark_for_close(TO_CONN(conn)); - return; - } } else { - log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Not " - "authenticating", + log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d, but we don't " + "know any of its authentication types. Not authenticating.", safe_str(conn->_base.address), conn->_base.port); } + + if (connection_or_send_netinfo(conn) < 0) { + log_warn(LD_OR, "Couldn't send netinfo cell"); + connection_mark_for_close(TO_CONN(conn)); + return; + } + #undef ERR }

1 0

[tor/master] Fix bug 4367: correctly detect auth_challenge cells we can't use
by nickm＠torproject.org 15 Nov '11

15 Nov '11

commit 88c4b425bd49d4cde52fdce7eeb65bcf2304d0f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 11:52:35 2011 -0400 Fix bug 4367: correctly detect auth_challenge cells we can't use Found by frosty_un, bugfix on 0.2.3.6-alpha, fix suggested by arma. --- changes/bug4367 | 5 +++++ src/or/command.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4367 b/changes/bug4367 new file mode 100644 index 0000000..77236d0 --- /dev/null +++ b/changes/bug4367 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Successfully detect AUTH_CHALLENGE cells with no recognized + authentication type listed. Fixes bug 4367; bugfix on 0.2.3.6-alpha. + Found by frosty_un. + diff --git a/src/or/command.c b/src/or/command.c index c02d353..6eb261c 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1100,7 +1100,7 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) conn->handshake_state->received_auth_challenge = 1; - if (use_type && public_server_mode(get_options())) { + if (use_type >= 0 && public_server_mode(get_options())) { log_info(LD_OR, "Got an AUTH_CHALLENGE cell from %s:%d: Sending " "authentication", safe_str(conn->_base.address), conn->_base.port);

1 0