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

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Oct '13

29 Oct '13

commit bcff9e96b397922f58e6ef1b05f5418c5b79baf8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 06:45:03 2013 +0000 Update translations for bridgedb --- sk/LC_MESSAGES/bridgedb.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po index 4a2b51c..35305d4 100644 --- a/sk/LC_MESSAGES/bridgedb.po +++ b/sk/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-10-29 06:00+0000\n" +"PO-Revision-Date: 2013-10-29 06:30+0000\n" "Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" "Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" "MIME-Version: 1.0\n" @@ -32,7 +32,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Potrebujem iný spôsob ako získať premostenia!" #: lib/bridgedb/templates/base.html:40 #, python-format @@ -44,7 +44,7 @@ msgstr "" #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Moje premostenia nefungujú! Potrebujem pomoc!" #: lib/bridgedb/templates/base.html:49 #, python-format @@ -63,7 +63,7 @@ msgstr "" #: lib/bridgedb/templates/bridges.html:13 msgid "No bridges currently available" -msgstr "" +msgstr "Momentálne nie sú dostupné žiadne premostenia." #: lib/bridgedb/templates/captcha.html:6 msgid "Upgrade your browser to Firefox"

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 29 Oct '13

29 Oct '13

commit ac3b26169382d87b0450049236d2715c35aad235 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 06:15:12 2013 +0000 Update translations for tsum --- sk/short-user-manual_sk_noimg.xhtml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sk/short-user-manual_sk_noimg.xhtml b/sk/short-user-manual_sk_noimg.xhtml index 8738ad6..cfa5f36 100644 --- a/sk/short-user-manual_sk_noimg.xhtml +++ b/sk/short-user-manual_sk_noimg.xhtml @@ -22,12 +22,12 @@ Poznámka: Prehliadač Tor pre Linux a Mac OS X sú pomerne veľké a nebudete ich môcť prijať na účty Gmail, Hotmail alebo Yahoo. Ak nemôžete prijať balík ktorý chcete, pošlite email na help(a)rt.torproject.org a my Vám dáme zoznam stránok odkiaľ je možné stiahnuť prehliadač. <h3 id="tor-for-smartphones">Tor pre smartfóny</h3> Môžete získať Tor na Vaše Android zariadenie tak, že nainštalujete balík s názvom Orbot. Pre informácie o tom ako stiahnuť a nainštalovať Orbot prosím navštívte <a href="https://www.torproject.org/docs/android.html.en">stránku Projektu Tor</a>. - We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. + Máme tiež experimentálne balíčky pre <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> a <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">Ako overiť či máte správnu verziu</h3> Pred spustením Balíčka Prehliadača Tor, uistite sa že máte správnu verziu. Softvér ktorý obdržíte je doprevádzaný so súborom s rovnakým názvom ako balíček a s koncovkou .asc. Tento .asc súbor je GPG podpis a umožňuje Vám overiť, že ste si stiahli presne ten súbor, ktorý ste mali v úmysle. Predtým, než môžete overiť podpis, budete musieť stiahnuť a nainštalovať GnuPG: - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Most Linux distributions come with GnuPG preinstalled. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: Väčšina linuxových distribúcií má už GnuPG predinštalovaný. Vezmite prosím na vedomie, že možno bude potrebné upraviť cesty k súborom a príkazy použité nižšie aby sa to dalo použiť na Vašom systéme. Erinn Clark podpíše Inštalačný Balík Tor s kľúčom 0x63FEE659. Ak chcete importovať Erinnov kľúč, zadajte: <pre> @@ -58,7 +58,7 @@ sub 2048R/EB399FD7 2003-10-16 Výstup programu by mal napísať "Good signature". Zlý podpis znamená, že mohlo byť so súborom manipulované. Ak uvidíte zlý podpis, pošlite detaily o tom kde ste tento program stiahli, ako ste overili balíček a výstup z programu GnuPG na email help(a)rt.torproject.org. Ak ste overili podpis a videli výstup "Good signature", môžete rozbaliť balíček. Následne by ste mali vidieť zložku podobnú tejto: tor-browser_en-US. Vo vnútri tejto zložky je ďalšia zložka s názvom Docs, ktorá obsahuje súbor s názvom changelog. Uistite sa, že číslo verzie zapísané na vrchnom riadku korešponduje s verziou v názve súboru. <h3 id="how-to-use-the-tor-browser-bundle">Ako požívať Balíček Prehliadača Tor</h3> - After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system). + Po stiahnutí balíčku Prehliadača Tor a jeho rozbalení by ste mali mať adresár s novými súbormi. Jeden z nich je spustiteľný súbor s názvom "Start Tor Browser" (alebo "start-tor-browser", v závislosti na Vašom operačnom systéme). Keď spustíte Balíček Prehliadača Tor uvidíte štartovacie okno Vidalia, ktoré Vás pripojí do siete Tor. Potom uvidíte prehliadač, ktorý Vám potvrdí, že používate Tor. Toto sa potvrdzuje navštívením stránky <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Teraz môžete prehliadať Internet cez Tor. Vezmite prosím na vedomie, že je dôležité používať prehliadač ktorý obsahuje inštalačný balíček a nie svoj vlastný. @@ -89,10 +89,10 @@ sub 2048R/EB399FD7 2003-10-16 <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> </ol> <h2 id="frequently-asked-questions">Často kladené otázky</h2> - This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org. - <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3> - If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>. - If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions: + Táto sekcia zodpovie niektoré z najčastejšie kladených otázok. Ak tu nenájdete Vašu otázku, prosím pošlite email na help(a)rt.torproject.org. + <h3 id="unable-to-extract-the-archive">Nepodarilo sa rozbaliť archív</h3> + Ak používate Windows a nedá sa rozbaliť archív, stiahnite a nainštalujte <a href="http://www.7-zip.org/">7-Zip</a>. + Ak sa Vám nedarí stiahnuť 7-Zip, skúste premenovať súbor .z na .zip a na rozbalenie použite winzip. Pred premenovaním nastavte Windows na zobrazovanie prípon súborov. <h4 id="windows-xp">Windows XP</h4> <ol style="list-style-type: decimal"> <li>Otvorte Môj Počítač</li> @@ -114,18 +114,18 @@ sub 2048R/EB399FD7 2003-10-16 <li>Kliknite na záložku Zobraziť</li> <li>Odčiarknite Skryť príponu súborov známych typov a kliknite na OK</li> </ol> - <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3> - You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: - You are already running Vidalia and Tor: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one. - Vidalia crashed, but left Tor running: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor. - For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website. + <h3 id="vidalia-asks-for-a-password">Vidalia požaduje heslo</h3> + Pri spúšťaní Vidalie by ste nemali byť žiadaný o vloženie hesla. Ak áno, zrejme máte niektorý z nasledujúcich problémov: + Vidalia a Tor už máte spustené: Táto situácia môže nastať napríklad vtedy, ak ste nainštalovali balík Vidalia a teraz sa snažíte spustiť balík Tor Browser. V tom prípade musíte najskôr zatvoriť staré verzie Vidalie a Tor. + Vidalia skolabovala, ale nechala Tor spustený: Ak má dialógové okno, ktoré žiada zadanie hesla tlačidlo reštart, môžete naň kliknúť a Vidalia reštartuje Tor s novým náhodným ovládacím heslom. Ak tlačidlo reštart nevidíte, alebo ak Vidalia nemôže reštartovať Tor, choďte do správcu úloh a ukončite Tor. Potom použite Vidaliu na reštartovanie Toru. + Pre viac informácií pozrite <a href="https://torproject.org/docs/faq.html#VidaliaPassword">často kladené otázky</a> na stránkach projektu Tor. <h3 id="flash-does-not-work">Flash nefunguje</h3> Kvôli bezpečnostným dôvodom sú Flash, Java a ostatné doplnky momentálny vypnuté. Doplnky fungujú nezávisle od Firefoxu a môžu vykonávať aktivity na Vašom počítači, ktoré zničia Vašu anonymitu. Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player. - Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle. - Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information. + Pamätajte, že prehliadač si nebude pamätať, že ste sa pridali do trialu, akonáhle ho zatvoríte. Takže pri ďalšom spustení balíka Prehliadača Tor sa budete musieť do trialu znova pripojiť. + Pre viac informácií prosím pozrite <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> <h3 id="i-want-to-use-another-browser">Chcem použiť iný prehliadač</h3> - For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks. + Z bezpečnostných dôvodov Vám odporúčame surfovať po internete skrze Tor jedine cez Prehliadač Tor. Je technicky možné používať Tor aj s inými prehliadačmi, ale otvoríte sa tým potencionálnym útokom. <h3 id="why-tor-is-slow">Prečo je Tor pomalý</h3> Tor môže byť niekedy pomalší než Vaše normálne Internetové pripojenie. Napokon Vaše dáta sú posielané cez mnoho rôznych krajín, niekedy cez oceány okolo sveta! </body>

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 Oct '13

29 Oct '13

commit 78fbc9af75db2fafb6d226f980d3ad9db6148919 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 06:15:03 2013 +0000 Update translations for bridgedb --- sk/LC_MESSAGES/bridgedb.po | 101 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..4a2b51c --- /dev/null +++ b/sk/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: +# Michelozzo <michalslovak2(a)hotmail.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-10-29 06:00+0000\n" +"Last-Translator: Michelozzo <michalslovak2(a)hotmail.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\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: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Čo sú to premostenia?" + +#: 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/tsum] Update translations for tsum
by translation＠torproject.org 29 Oct '13

29 Oct '13

commit 5c895c732587b41cdb6c8bae6b3f1197f3347bd7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 05:45:10 2013 +0000 Update translations for tsum --- sk/short-user-manual_sk_noimg.xhtml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sk/short-user-manual_sk_noimg.xhtml b/sk/short-user-manual_sk_noimg.xhtml index b21906d..8738ad6 100644 --- a/sk/short-user-manual_sk_noimg.xhtml +++ b/sk/short-user-manual_sk_noimg.xhtml @@ -72,23 +72,23 @@ sub 2048R/EB399FD7 2003-10-16 Ak Tor stále nefunguje, je možné, že Váš Internetový provider (ISP) blokuje Tor. Veľmi často sa to dá obísť s Mostmi Tor, skrytými relé ktoré sa neblokujú tak ľahko. Ak potrebujete pomôcť prísť na to, prečo sa Tor nepripojí, pošlite email na help(a)rt.torproject.org a priložte dôležité časti z logu. <h3 id="how-to-find-a-bridge">Ako nájsť most</h3> - To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write get bridges in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address. - Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often. + Aby ste mohli používať premostenie, musíte najskôr nejaké lokalizovať; môžete prejsť na <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, alebo môžete poslať email na bridges(a)torproject.org. Ak pošlete email, prosím uistite sa, že do predmetu správy napíšete get bridges, inak nedostanete odpoveď. Berte prosím na vedomie, že tento email musíte poslať z adresy gmail.com, alebo yahoo.com. + Nastavením viacerých premostení bude Vaše Tor pripojenie stabilnejšie v prípade, že sa niektoré premostenia stanú nedostupnými. Neexistuje žiadna istota, že premostenie, ktoré teraz používate, bude fungovať aj zajtra, takže by ste si mali osvojiť návyk pravidelne aktualizovať Váš zoznam mostov. <h3 id="how-to-use-a-bridge">Ako používať premostenie</h3> - Once you have a set of bridges to use, open the Vidalia control panel, click on Settings, Network and tick the box that says My ISP blocks connections to the Tor network. Enter the bridges in the box below, hit OK and start Tor again. + Keď získate niekoľko premostení, otvorte ovládací panel Vidalia, kliknite na Nastavenia, Sieť a zaškrtnite políčko s textom Môj ISP blokuje pripojenie k sieti Tor. Vložte premostenia do poľa nižšie, potvrďte OK a spustite Tor znova. <h3 id="how-to-use-an-open-proxy">Ako požívať otvorenú proxy</h3> - If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet. - The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies. + Ak použitie premostenia nefunguje, pokúste sa nastaviť Tor na používanie akéhokoľvek HTTPS alebo SOCKS proxy, aby ste získali prístup do siete Tor. To znamená, že aj keď je Tor blokovaný vašou lokálnou sieťou, budete môcť bezpečne používať otvorený proxy na pripojenie do siete Tor a necenzurovaný internet. + Nasledujúci postup postup predpokladá, že máte funkčnú Tor/Vidalia konfiguráciu a že ste našli zoznam HTTPS, SOCKS4, alebo SOCKS5 proxin. <ol style="list-style-type: decimal"> <li>Open the Vidalia control panel, click on Settings.</li> <li>Click Network. Select I use a proxy to access the Internet.</li> <li>On the Address line, enter the open proxy address. This can be a hostname or an IP Address.</li> <li>Vložte port pre proxy.</li> - <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li> + <li>Zvyčajne nie je potrebné zadávať užívateľské meno a heslo. Ak áno, vyplňte tieto údaje.</li> <li>Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li> <li>Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li> </ol> - <h2 id="frequently-asked-questions">Frequently Asked Questions</h2> + <h2 id="frequently-asked-questions">Často kladené otázky</h2> This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org. <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3> If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.

1 0

[tor/master] Only launch transport proxies that provide useful transports.
by nickm＠torproject.org 29 Oct '13

29 Oct '13

commit 6f33dffec1bfb7c33979477688189c63c1bfb538 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Feb 28 18:58:36 2013 +0200 Only launch transport proxies that provide useful transports. --- changes/bug5018 | 3 +++ src/or/config.c | 20 ++++++++++++++++---- src/or/entrynodes.c | 23 +++++++++++++++++++++++ src/or/entrynodes.h | 1 + 4 files changed, 43 insertions(+), 4 deletions(-) diff --git a/changes/bug5018 b/changes/bug5018 new file mode 100644 index 0000000..c5c12ef --- /dev/null +++ b/changes/bug5018 @@ -0,0 +1,3 @@ + o Minor features: + - Don't launch pluggable transport proxies that contribute + transports we don't need. Resolves ticket 5018. diff --git a/src/or/config.c b/src/or/config.c index 18f1c29..331f410 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4242,7 +4242,8 @@ parse_client_transport_line(const char *line, int validate_only) int is_managed=0; char **proxy_argv=NULL; char **tmp=NULL; - int proxy_argc,i; + int proxy_argc, i; + int is_useless_proxy=1; int line_length; @@ -4264,11 +4265,16 @@ parse_client_transport_line(const char *line, int validate_only) smartlist_split_string(transport_list, transports, ",", SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport_name) { + /* validate transport names */ if (!string_is_C_identifier(transport_name)) { log_warn(LD_CONFIG, "Transport name is not a C identifier (%s).", transport_name); goto err; } + + /* see if we actually need the transports provided by this proxy */ + if (!validate_only && transport_is_needed(transport_name)) + is_useless_proxy = 0; } SMARTLIST_FOREACH_END(transport_name); /* field2 is either a SOCKS version or "exec" */ @@ -4287,9 +4293,15 @@ parse_client_transport_line(const char *line, int validate_only) } if (is_managed) { /* managed */ - if (!validate_only) { /* if we are not just validating, use the - rest of the line as the argv of the proxy - to be launched */ + if (!validate_only && is_useless_proxy) { + log_warn(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " + "any needed transports and will not be launched.", line); + } + + /* If we are not just validating, use the rest of the line as the + argv of the proxy to be launched. Also, make sure that we are + only launching proxies that contribute useful transports. */ + if (!validate_only && !is_useless_proxy) { proxy_argc = line_length-2; tor_assert(proxy_argc > 0); proxy_argv = tor_malloc_zero(sizeof(char*)*(proxy_argc+1)); diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index f1af75a..beb855d 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1761,6 +1761,29 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port, } SMARTLIST_FOREACH_END(bridge); } +/** Return True if we have a bridge that uses a transport with name + * transport_name. */ +int +transport_is_needed(const char *transport_name) +{ + int retval; + smartlist_t *needed_transports = NULL; + + if (!bridge_list) + return 0; + + needed_transports = smartlist_new(); + + SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { + if (bridge->transport_name) + smartlist_add(needed_transports, bridge->transport_name); + } SMARTLIST_FOREACH_END(bridge); + + retval = smartlist_string_isin(needed_transports, transport_name); + smartlist_free(needed_transports); + return retval; +} + /** Remember a new bridge at addr:port. If digest * is set, it tells us the identity key too. If we already had the * bridge in our list, unmark it, and don't actually add anything new. diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h index 52b8dc0..b02cd48 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@ -118,6 +118,7 @@ struct transport_t; int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const struct transport_t **transport); +int transport_is_needed(const char *transport_name); int validate_pluggable_transports_config(void); double pathbias_get_close_success_count(entry_guard_t *guard);

1 0

[tor/master] Simplify transport_is_needed.
by nickm＠torproject.org 29 Oct '13

29 Oct '13

commit e6e6c245c8ef3e5f854d82a67550456857f57ed4 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 14:34:48 2013 -0700 Simplify transport_is_needed. By Roger at https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- src/or/entrynodes.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index beb855d..ca3ef53 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1766,22 +1766,16 @@ bridge_resolve_conflicts(const tor_addr_t *addr, uint16_t port, int transport_is_needed(const char *transport_name) { - int retval; - smartlist_t *needed_transports = NULL; - if (!bridge_list) return 0; - needed_transports = smartlist_new(); - SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { - if (bridge->transport_name) - smartlist_add(needed_transports, bridge->transport_name); + if (bridge->transport_name && + !strcmp(bridge->transport_name, transport_name)) + return 1; } SMARTLIST_FOREACH_END(bridge); - retval = smartlist_string_isin(needed_transports, transport_name); - smartlist_free(needed_transports); - return retval; + return 0; } /** Remember a new bridge at addr:port. If digest

1 0

[tor/master] Document that unneeded transports are ignored.
by nickm＠torproject.org 29 Oct '13

29 Oct '13

commit 2235d65240ed1624d49a79891bc5ae564a6a4f34 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Oct 26 14:37:50 2013 -0700 Document that unneeded transports are ignored. Suggested by Roger in https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- src/or/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 331f410..0324015 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4220,7 +4220,8 @@ parse_bridge_line(const char *line, int validate_only) * line. Return 0 if the line is well-formed, and -1 if it * isn't. * - * If validate_only is 0, and the line is well-formed: + * If validate_only is 0, the line is well-formed, and the + * transport is needed by some bridge: * - If it's an external proxy line, add the transport described in the line to * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */

1 0

[tor/master] Merge remote-tracking branch 'public/bug5018'
by nickm＠torproject.org 29 Oct '13

29 Oct '13

commit 4b6f074df9c540cb4847793b7e8243c8f642de0a Merge: 49278cd 2235d65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 29 01:29:59 2013 -0400 Merge remote-tracking branch 'public/bug5018' Conflicts: src/or/entrynodes.c changes/bug5018 | 3 +++ src/or/config.c | 23 ++++++++++++++++++----- src/or/entrynodes.c | 17 +++++++++++++++++ src/or/entrynodes.h | 1 + 4 files changed, 39 insertions(+), 5 deletions(-) diff --cc src/or/entrynodes.c index 59cc9a3,ca3ef53..ecc67f0 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@@ -1801,10 -1761,31 +1801,27 @@@ bridge_resolve_conflicts(const tor_addr } SMARTLIST_FOREACH_END(bridge); } + /** Return True if we have a bridge that uses a transport with name + * transport_name. */ + int + transport_is_needed(const char *transport_name) + { + if (!bridge_list) + return 0; + + SMARTLIST_FOREACH_BEGIN(bridge_list, const bridge_info_t *, bridge) { + if (bridge->transport_name && + !strcmp(bridge->transport_name, transport_name)) + return 1; + } SMARTLIST_FOREACH_END(bridge); + + return 0; + } + -/** Remember a new bridge at addr:port. If digest - * is set, it tells us the identity key too. If we already had the - * bridge in our list, unmark it, and don't actually add anything new. - * If transport_name is non-NULL - the bridge is associated with a - * pluggable transport - we assign the transport to the bridge. */ +/** Register the bridge information in bridge_line to the + * bridge subsystem. Steals reference of bridge_line. */ void -bridge_add_from_config(const tor_addr_t *addr, uint16_t port, - const char *digest, const char *transport_name) +bridge_add_from_config(bridge_line_t *bridge_line) { bridge_info_t *b; diff --cc src/or/entrynodes.h index 1f8cff7,b02cd48..772c666 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@@ -120,9 -115,10 +120,10 @@@ void entry_guards_free_all(void) const char *find_transport_name_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); struct transport_t; -int find_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, +int get_transport_by_bridge_addrport(const tor_addr_t *addr, uint16_t port, const struct transport_t **transport); + int transport_is_needed(const char *transport_name); int validate_pluggable_transports_config(void); double pathbias_get_close_success_count(entry_guard_t *guard);

1 0

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

29 Oct '13

commit 329b09e751bdc55deb05243c83cdf3b078fe9346 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 05:16:10 2013 +0000 Update translations for tor-launcher-properties_completed --- sk/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties index 0c469d8..ee9a65b 100644 --- a/sk/torlauncher.properties +++ b/sk/torlauncher.properties @@ -4,6 +4,7 @@ torlauncher.error_title=Spúšťač Tor torlauncher.tor_exited=Tor bol neočakávane ukončený. +torlauncher.please_restart_app=Prosím reštartujte túto aplikáciu. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. torlauncher.tor_bootstrap_failed=Nepodarilo sa pripojiť k sieti Tor.\n\n%S

1 0

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

29 Oct '13

commit 6175a2904951feb2540eabe5a2374cd9573103fb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 29 05:16:08 2013 +0000 Update translations for tor-launcher-properties --- sk/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties index ce491a1..ee9a65b 100644 --- a/sk/torlauncher.properties +++ b/sk/torlauncher.properties @@ -4,7 +4,7 @@ torlauncher.error_title=Spúšťač Tor torlauncher.tor_exited=Tor bol neočakávane ukončený. -# torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=Prosím reštartujte túto aplikáciu. torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor. torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť. torlauncher.tor_bootstrap_failed=Nepodarilo sa pripojiť k sieti Tor.\n\n%S

1 0