August 2012 - tor-commits - lists.torproject.org

r25766: {website} Patch docs/rpm per Ondrej's instructions, II (website/trunk/docs/en)
by Peter Palfrader 24 Aug '12

24 Aug '12

Author: weasel Date: 2012-08-24 13:35:03 +0000 (Fri, 24 Aug 2012) New Revision: 25766 Modified: website/trunk/docs/en/rpms.wml Log: Patch docs/rpm per Ondrej's instructions, II Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-08-24 13:27:38 UTC (rev 25765) +++ website/trunk/docs/en/rpms.wml 2012-08-24 13:35:03 UTC (rev 25766) @@ -27,7 +27,7 @@ <pre>[tor-experimental] name=Tor experimental repo enabled=1 -baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/$basearch/ +baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/ gpgcheck=1 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.… @@ -35,18 +35,13 @@ name=Tor experimental source repo enabled=1 autorefresh=0 -baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/SRPMS +baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS gpgcheck=1 gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.…</pre> - If you wish to track the stable releases of Tor, you should substitute - DISTRIBUTION with one of the following: centos4, centos5, fc13, - fc14, fc15, suse</p> + If you wish to track the experimental releases of Tor, you should substitute + DISTRIBUTION with one of the following: el/5, el/6, fc/16 and fc/17</p> - <p>To track experimental releases, substitute DISTRIBUTION with one of these: - centos4-experimental, centos5-experimental, fc13-experimental, - fc14-experimental, suse-experimental</p> - <p> Then install Tor by running: </p>

1 0

r25765: {website} Patch docs/rpm per Ondrej's instructions (website/trunk/docs/en)
by Peter Palfrader 24 Aug '12

24 Aug '12

Author: weasel Date: 2012-08-24 13:27:38 +0000 (Fri, 24 Aug 2012) New Revision: 25765 Modified: website/trunk/docs/en/rpms.wml Log: Patch docs/rpm per Ondrej's instructions Modified: website/trunk/docs/en/rpms.wml =================================================================== --- website/trunk/docs/en/rpms.wml 2012-08-23 10:08:16 UTC (rev 25764) +++ website/trunk/docs/en/rpms.wml 2012-08-24 13:27:38 UTC (rev 25765) @@ -24,14 +24,20 @@ You'll need to set up our package repository before you can fetch Tor. Assuming yum, in /etc/yum.repos.d/, create a file called torproject.repo. Edit this file with the following information: -<pre>[torproject] -name=Tor and Vidalia +<pre>[tor-experimental] +name=Tor experimental repo enabled=1 +baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/$basearch/ +gpgcheck=1 +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc + +[tor-experimental-source] +name=Tor experimental source repo +enabled=1 autorefresh=0 -baseurl=http://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/ -type=rpm-md +baseurl=http://deb.torproject.org/torproject.org/rpm/el/6/SRPMS gpgcheck=1 -gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org</pre> +gpgkey=http://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc</pre> If you wish to track the stable releases of Tor, you should substitute DISTRIBUTION with one of the following: centos4, centos5, fc13,

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 24 Aug '12

24 Aug '12

commit 7b3dc58c9577416bb41003e0002d4ff7f94d4615 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 24 13:15:28 2012 +0000 Update translations for vidalia_help_completed --- cs/services.po | 247 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 247 insertions(+), 0 deletions(-) diff --git a/cs/services.po b/cs/services.po new file mode 100644 index 0000000..68ba59e --- /dev/null +++ b/cs/services.po @@ -0,0 +1,247 @@ +# +# Translators: +# <digitaldreamer(a)email.cz>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-06-26 17:00+0200\n" +"PO-Revision-Date: 2012-08-24 13:14+0000\n" +"Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: cs\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" + +#. type: Content of: <html><body><h1> +#: en/services.html:16 +msgid "Hidden Services" +msgstr "Skryté Služby" + +#. type: Content of: <html><body> +#: en/services.html:19 +msgid "" +"Remark: Support for hidden services is new in Vidalia. You should expect it " +"to have bugs, some of which possibly corrupting your hidden service " +"configuration. So, don't rely on it, or rather, don't blame us if something " +"goes wrong. If you find bugs or have comments on this new feature, please " +"let us know! We need your feedback. <a name=\"about\"/>" +msgstr "Poznámka: podpora skrytých služeb je ve Vidalii nová. Měli byste být připraveni na to, že v ní budou chyby, z nichž některé mohou poškodit vaše nastavení skrytých služeb. Takže se na ni nespoléhejte, nebo spíše, neobviňujte nás, pokud se něco pokazí. Pokud narazíte na chybu, nebo máte k této nové funkci poznámky, napište nám! Potřebujeme zpětnou vazbu. <a name=\"about\"/>" + +#. type: Content of: <html><body><h3> +#: en/services.html:26 +msgid "What is a hidden service?" +msgstr "Co je to skrytá služba?" + +#. type: Content of: <html><body><p> +#: en/services.html:28 +msgid "" +"Hidden services allow you to provide any kind of TCP-based service, e.g. an " +"HTTP service, to others without revealing your IP address. The protocol to " +"provide a hidden service is built on top of the same circuits that Tor uses " +"for anonymous browsing and roughly has similar anonymity properties." +msgstr "Skryté služby vám umožňují poskytovat jakoukoli službu založenou na protokolu TCP, například HTTP službu ostátním aniž byste museli odhalit svou IP adresu. Protokol poskytující službu je postaven na stejném okrhu jaký Tor používá pro anonymní surfování a má přibližně podobné vlastnosti z hlediska anonymity." + +#. type: Content of: <html><body><p> +#: en/services.html:35 +msgid "" +"For more information on hidden service you may want to read section 5 of " +"Tor's design paper (doc/design-paper/tor-design.pdf) or the Rendezvous " +"Specification (doc/spec/rend-spec.txt)." +msgstr "Více informací o skrytých službách najdete v sekci 5 návrhového dokumentu pro Tor (doc/design-paper/tor-design.pdf) nebo ve Specifikaci Rendezvous (doc/spec/rend-spec.txt). " + +#. type: Content of: <html><body> +#: en/services.html:40 +msgid "<a name=\"provide\"/>" +msgstr "<a name=\"provide\"/>" + +#. type: Content of: <html><body><h3> +#: en/services.html:41 +msgid "How do I provide a hidden service?" +msgstr "Jak mohu poskytovat skrytou službu?" + +#. type: Content of: <html><body><p> +#: en/services.html:43 +msgid "Providing a hidden service consists of at least two steps:" +msgstr "Poskytování skryté služby se skládá minimálně ze dvou kroků:" + +#. type: Content of: <html><body><p><ol><li> +#: en/services.html:45 +msgid "" +"Install a web server locally (or a server for whatever service you want to " +"provide, e.g. IRC) to listen for local requests." +msgstr "Nainstalujte lokálně webserver (nebo server jiné sluby kterou chcete poskytovat, např. IRC) a nastavte ho, aby naslouchal lokálním požadavkům." + +#. type: Content of: <html><body><p><ol><li> +#: en/services.html:47 +msgid "" +"Configure your hidden service, so that Tor relays requests coming from Tor " +"users to your local server." +msgstr "Nastavte svou skrytou službu tak, aby Tor předával požadavky přicházející od uživatelů Toru vašemu lokálnímu serveru." + +#. type: Content of: <html><body><p> +#: en/services.html:50 +msgid "" +"There is a fine tutorial on the Tor website (https://www.torproject.org/docs" +"/tor-hidden-service.html) that describes these steps in more detail." +msgstr "Na stránkách Toru je pěkný návod (https://www.torproject.org/docs/tor-hidden-service.html) který tyto kroky popisuje podrobněji." + +#. type: Content of: <html><body> +#: en/services.html:55 +msgid "<a name=\"data\"/>" +msgstr "<a name=\"data\"/>" + +#. type: Content of: <html><body><h3> +#: en/services.html:56 +msgid "What data do I need to provide?" +msgstr "Jaká data musím poskytnout?" + +#. type: Content of: <html><body><p> +#: en/services.html:58 +msgid "" +"The services table contains five columns containing data about configured " +"hidden services:" +msgstr "Tabulka služeb obsahuje pět sloupců obsahujících data o konfigurovaných webových službách:" + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:61 +msgid "" +"Onion Address (generated): The service (or onion) address is generated by " +"Tor to uniquely identify your service. Give this onion address to the people" +" who shall be able to access your service. You may use the \"Copy to " +"clipboard\" button for that to avoid typos. If you have just created a " +"hidden service, the field says \"[Created by Tor]\"; in order to make it " +"display the real onion address, you need to save your configuration and re-" +"open the settings window." +msgstr "Onion Adresa (generovaná): Adresu služby (nebo onion adresu) vygeneruje Tor aby jedinečně identifikoval vaší službu. Tuto adresu dejte lidem, kteří mají mít k vaší službě přístup. Můžete použít tlačítko \"Zkopírovat do clipboardu\", abyste abyste se vyhnuli překlepům. Pokud jste právě vytvořili skrytou službu, bude v tomto poli napsáno \"[Created by Tor]\"; k tomu, aby se v ní objevovala skutečná onion adresa, je třeba abyste vaše nastavení uloužili a otevřeli okno nastavení znovu." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:68 +msgid "" +"Virtual Port (required): This is the TCP port that clients will need to know" +" in order to access your service. Typically, you will want to use the " +"service-specific port here, e.g. port 80 for HTTP. Note that the virtual " +"port usually has nothing to do with firewall settings, because it is only " +"used Tor-internally." +msgstr "Virtuální Port (povinný údaj): Toto je číslo TCP portu které musí klient znát, aby měl přístup k vaší službě. Obyvkle byste měli zvolit port specifický pro danou službu, např. port 80 pro HTTP. Všiměte si, že virtuální porty nemají nic společného s nastavením firewallu, protože slouží jen pro vnitřní použití v Toru." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:73 +msgid "" +"Target (optional): Usually you want Tor to relay connection requests to " +"localhost on a different port than the one you specified in \"Virtual " +"Port\". Therefore, you can specify a target consisting of physical address " +"and port to which requests to your hidden service are redirected, e.g. to " +"localhost:5222 (or on whatever port your server is listening). If you don't " +"specify any target, Tor will redirect requests to the port specified in " +"\"Virtual Port\" on localhost." +msgstr "Cíl (nepovinné): Obvykle budete potřebovat, aby Tor předal požadavky na připojení vašemu localhostu na jiném portu, než jaký jste specifikovali jako \"Virtuální Port\". Proto můžete specifikovat cíl služený z fysické adresy a portu, na který mají být přesměrovány požadvky pro vaší skrytou službu, např. na localhost:5222 (nebo jakýkoli port, na kterém váš server naslouchá). Pokud neurčíte jiný cíl, bude Tor přesměrovávat požadavky na port vyplněný jako \"Virtuální Port\" na localhost." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:81 +msgid "" +"Service Directory (required): Tor needs to store some hidden-service " +"specific files in a separate directory, e.g. a private key and a hostname " +"file containing the onion address. This directory should be distinct from a " +"directory containing content that the service provides. A good place for a " +"service directory might be a sub directory in Tor's data directory. -- Note " +"that you cannot change the directory of a running service (it wouldn't make " +"much sense to allow it, because Vidalia is not supposed to move directories " +"on your hard disk!). If you want to move a hidden service to another " +"directory, please proceed as follows: Start by disabling the service in " +"Vidalia and save the configuration. Then move the directory on your hard " +"disk to the new place. Finally, change the directory in Vidalia to the new " +"location, enable the service again, and save the new configuration." +msgstr "Adresář Služby (povinný údaj): Tor musí ukladat některé soubory, specifické pro skrytou službu, v samostaném adresáři, například soukromý klíč a soubor hostname, který obsahuje onion adresu. Tento adresář by měl být jiný naž adrsář s obsahem, který vaše služba poskytuje. Dobré místo pro tento adrsář skryté služby může být podadresář adresáře \"data\" v Toru. -- Mějte na paměti že nemůžete měnit adresář běžící služby (což by ani nedávalo smysl, protože Vidalia nemá přesunovat adresáře na vašem disku!). Pokud chcete skrytou službu přesunout do jiného adresáře, postupujte prosím takto: Nejprve ve Vidalii službu vypněte a uložte nastavení. Pak přesuňte její adresář na vašem disku na nové místo, znovu povolte službu, a uložte nové nastavení." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:95 +msgid "" +"Enabled: If this checkbox is disabled, Vidalia will not configure the given " +"hidden service in Tor. This can be useful for keeping the configuration of a" +" currently unused service for later use. All non-enabled services are stored" +" in the Vidalia-specific configuration file vidalia.conf." +msgstr "Zapnuto: Není-li toto políčko zašktnuté, Vidalia nebude danou službu konfigurovat v Toru. To se může hodit pokud chcete zachovat nastavení v současnosti nepoužívané služby pro pozdější použití. Všechny služby, které nejsou zapnuté jsou uloženy ve specifickém konfiguračním souboru Vidalie, vidalia.conf." + +#. type: Content of: <html><body> +#: en/services.html:103 +msgid "<a name=\"buttons\"/>" +msgstr "<a name=\"buttons\"/>" + +#. type: Content of: <html><body><h3> +#: en/services.html:104 +msgid "What are the five buttons used for?" +msgstr "K čemu slouží těch pět tlačítek?" + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:107 +msgid "Add service: Creates a new empty service configuration." +msgstr "Přidat službu: Vytvoří nové prázdné nastavení služby." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:108 +msgid "" +"Remove service: Permanently removes a hidden service configuration. (If you" +" want to temporarily remove a service, uncheck its Enabled checkbox.)" +msgstr "Odstranit službu: Natrvalo smaže nastavení skryté služby. (pokud chcete službu odstranit jen dočasně, odškrtněte její poíčko Zapnuto)." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:111 +msgid "" +"Copy to clipboard: Copies the onion address to the clipboard, so that you " +"can tell it to whoever shall be able to use your service." +msgstr "Zkopírovat do clipboardu: Zkopíruje onion adresu do clipboardu, abyste jí mohli říci těm, kteří mají mít přístup k vaší službě." + +#. type: Content of: <html><body><p><ul><li> +#: en/services.html:114 +msgid "Browse: Lets you browse to find a local hidden service directory." +msgstr "Procházet: Nechá vás procházet adresáře abyste mohli najít lokální adresář skryté služby." + +#. type: Content of: <html><body> +#: en/services.html:119 +msgid "<a name=\"advanced\"/>" +msgstr "<a name=\"advanced\"/>" + +#. type: Content of: <html><body><h3> +#: en/services.html:120 +msgid "How can I configure advanced hidden service settings?" +msgstr "Jak můžu nakonfigurovat pokročilé nastavení skryté služby?" + +#. type: Content of: <html><body><p> +#: en/services.html:122 +msgid "" +"Tor allows configuration of more specific settings for hidden services, e.g." +" forcing to use (or avoiding) certain nodes as introduction points, or " +"providing multiple virtual ports for the same service." +msgstr "Tor umožňuje konfigurovat podrobnější nastavení skrytých služeb, jako příkaz používat (nebo se vyhnout) určitým uzlům jako zaváděcím bodům, nebo poskytnout více virtuálních portů pro tutéž službu." + +#. type: Content of: <html><body><p> +#: en/services.html:128 +msgid "" +"However, we decided to simplify things in Vidalia and provide only the most " +"common settings. If you want to configure advanced settings, you need to do " +"so in Tor's torrc file. Vidalia will not remove those settings even when you" +" are editing your hidden services. If you specify more than one virtual " +"port, only the first will be displayed and be editable." +msgstr "Rozhodli jsme se však Vidalii zjednodušit, a nabídnout jen nejběžnější nastavení. Pokud chcete konfigurovat pokročilá nastavení, musíte top udělat v souboru torrc v Toru. Vidalia tato nastavení neodstraní ani když budete editovat své skryté služby. Pokud určíte více než jeden virtuální port, bude zobrazen k editování pouze ten první." + +#. type: Content of: <html><body> +#: en/services.html:135 +msgid "<a name=\"client\"/>" +msgstr "<a name=\"client\"/>" + +#. type: Content of: <html><body><h3> +#: en/services.html:136 +msgid "How does Vidalia help me to access other hidden services?" +msgstr "Jak mi Vidalia pomůže připojit se k jiným skrytým službám?" + +#. type: Content of: <html><body><p> +#: en/services.html:138 +msgid "" +"Not at all. There is no need to do so. If you want to access another hidden " +"service, type the service's onion address in your browser (or appropriate " +"client application if it's not a web service), and Tor does the rest for " +"you. There is no need to specifically configure Tor for that." +msgstr "Nijak. Není to třeba. Pokud se chcete připojit ke skryté službě, napište její onion adresu do vašeho prohlížeče (nebo patřičného klienta pokud to není webová služba), a Tor udělá zbytek za vás. Není třeba kvůli tomu Tor jakkoli konfigurovat."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 24 Aug '12

24 Aug '12

commit 795393efeaa5ae1905c51e437b035d9d6d56b35e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 24 13:15:20 2012 +0000 Update translations for vidalia_help --- cs/services.po | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cs/services.po b/cs/services.po index 76a03ed..68ba59e 100644 --- a/cs/services.po +++ b/cs/services.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-08-23 14:01+0000\n" +"PO-Revision-Date: 2012-08-24 13:14+0000\n" "Last-Translator: digitaldreamer <digitaldreamer(a)email.cz>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "" "configuration. So, don't rely on it, or rather, don't blame us if something " "goes wrong. If you find bugs or have comments on this new feature, please " "let us know! We need your feedback. <a name=\"about\"/>" -msgstr "Poznámka: podpora skrytých služeb je ve Vidalii nová. Měli byste být připraveni na to, že v ní budou chyby, z nichž některé mohou poškodit vaše nastavení skrytýc služeb. Takže se na ni nespoléhejte, nebo spíše, neobviňujte nás, pokud se něco pokazí. Pokud narazíte na chybu, nebo máte k této nové funkci poznámky, napište nám! Potřebujeme zpětnou vazbu. <a name=\"about\"/>" +msgstr "Poznámka: podpora skrytých služeb je ve Vidalii nová. Měli byste být připraveni na to, že v ní budou chyby, z nichž některé mohou poškodit vaše nastavení skrytých služeb. Takže se na ni nespoléhejte, nebo spíše, neobviňujte nás, pokud se něco pokazí. Pokud narazíte na chybu, nebo máte k této nové funkci poznámky, napište nám! Potřebujeme zpětnou vazbu. <a name=\"about\"/>" #. type: Content of: <html><body><h3> #: en/services.html:26 @@ -192,22 +192,22 @@ msgstr "Odstranit službu: Natrvalo smaže nastavení skryté služby. (pokud msgid "" "Copy to clipboard: Copies the onion address to the clipboard, so that you " "can tell it to whoever shall be able to use your service." -msgstr "" +msgstr "Zkopírovat do clipboardu: Zkopíruje onion adresu do clipboardu, abyste jí mohli říci těm, kteří mají mít přístup k vaší službě." #. type: Content of: <html><body><p><ul><li> #: en/services.html:114 msgid "Browse: Lets you browse to find a local hidden service directory." -msgstr "" +msgstr "Procházet: Nechá vás procházet adresáře abyste mohli najít lokální adresář skryté služby." #. type: Content of: <html><body> #: en/services.html:119 msgid "<a name=\"advanced\"/>" -msgstr "" +msgstr "<a name=\"advanced\"/>" #. type: Content of: <html><body><h3> #: en/services.html:120 msgid "How can I configure advanced hidden service settings?" -msgstr "" +msgstr "Jak můžu nakonfigurovat pokročilé nastavení skryté služby?" #. type: Content of: <html><body><p> #: en/services.html:122 @@ -215,7 +215,7 @@ msgid "" "Tor allows configuration of more specific settings for hidden services, e.g." " forcing to use (or avoiding) certain nodes as introduction points, or " "providing multiple virtual ports for the same service." -msgstr "" +msgstr "Tor umožňuje konfigurovat podrobnější nastavení skrytých služeb, jako příkaz používat (nebo se vyhnout) určitým uzlům jako zaváděcím bodům, nebo poskytnout více virtuálních portů pro tutéž službu." #. type: Content of: <html><body><p> #: en/services.html:128 @@ -225,17 +225,17 @@ msgid "" "so in Tor's torrc file. Vidalia will not remove those settings even when you" " are editing your hidden services. If you specify more than one virtual " "port, only the first will be displayed and be editable." -msgstr "" +msgstr "Rozhodli jsme se však Vidalii zjednodušit, a nabídnout jen nejběžnější nastavení. Pokud chcete konfigurovat pokročilá nastavení, musíte top udělat v souboru torrc v Toru. Vidalia tato nastavení neodstraní ani když budete editovat své skryté služby. Pokud určíte více než jeden virtuální port, bude zobrazen k editování pouze ten první." #. type: Content of: <html><body> #: en/services.html:135 msgid "<a name=\"client\"/>" -msgstr "" +msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136 msgid "How does Vidalia help me to access other hidden services?" -msgstr "" +msgstr "Jak mi Vidalia pomůže připojit se k jiným skrytým službám?" #. type: Content of: <html><body><p> #: en/services.html:138 @@ -244,4 +244,4 @@ msgid "" "service, type the service's onion address in your browser (or appropriate " "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." -msgstr "" +msgstr "Nijak. Není to třeba. Pokud se chcete připojit ke skryté službě, napište její onion adresu do vašeho prohlížeče (nebo patřičného klienta pokud to není webová služba), a Tor udělá zbytek za vás. Není třeba kvůli tomu Tor jakkoli konfigurovat."

1 0

[metrics-tasks/master] Merge families based on all recently running relays (#6662).
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit c6c0a74859bfb11887e44b2fb82245fb75744118 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 24 14:46:02 2012 +0200 Merge families based on all recently running relays (#6662). --- task-6662/.gitignore | 3 +++ task-6662/Eval.java | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/task-6662/.gitignore b/task-6662/.gitignore new file mode 100644 index 0000000..1f27701 --- /dev/null +++ b/task-6662/.gitignore @@ -0,0 +1,3 @@ +*.class +details.json + diff --git a/task-6662/Eval.java b/task-6662/Eval.java index 5359fba..1c6651a 100644 --- a/task-6662/Eval.java +++ b/task-6662/Eval.java @@ -1,7 +1,7 @@ import java.io.*; import java.util.*; public class Eval { - /* curl "https://onionoo.torproject.org/details?running=true&type=relay" > details.json */ + /* curl "https://onionoo.torproject.org/details?type=relay" > details.json */ public static void main(String[] args) throws Exception { /* Parse relays and their families from details.json. Also create a @@ -16,7 +16,8 @@ public class Eval { new TreeMap<String, Set<String>>(); Map<String, String> nicknames = new HashMap<String, String>(); Map<String, String> namedRelays = new HashMap<String, String>(); - Set<String> unnamedRelays = new HashSet<String>(); + Set<String> runningRelays = new HashSet<String>(), + unnamedRelays = new HashSet<String>(); while ((line = br.readLine()) != null) { if (isParsingFamily) { if (line.startsWith(" ")) { @@ -32,6 +33,10 @@ public class Eval { } else if (line.startsWith("\"fingerprint\":")) { fingerprint = "$" + line.split(":")[1].split("\"")[1]; nicknames.put(fingerprint, nickname); + } else if (line.startsWith("\"running\":")) { + if (line.endsWith("true,")) { + runningRelays.add(nickname + "~" + fingerprint.substring(1, 5)); + } } else if (line.startsWith("\"flags\":")) { if (line.contains("\"Named\"")) { if (namedRelays.containsKey(nickname)) { @@ -54,7 +59,8 @@ public class Eval { SortedSet<String> unconfirmedFamilyStrings = new TreeSet<String>(); System.out.println("Complete family relationships as reported by " + "running relays, not mutually confirmed and possibly " - + "containing nicknames of unnamed relays:"); + + "containing nicknames of unnamed relays, including non-running " + + "relays:"); for (Map.Entry<String, Set<String>> e : listedRelays.entrySet()) { StringBuilder sb = new StringBuilder(); sb.append(nicknames.get(e.getKey()) + "~" @@ -131,7 +137,8 @@ public class Eval { confirmedFamilyStrings.add(sb.toString()); } System.out.println("Mutually confirmed families with two or more " - + "family members, without reporting relay itself"); + + "family members, without reporting relay itself, including " + + "non-running relays"); for (String s : confirmedFamilyStrings) { System.out.println(s); } @@ -162,7 +169,7 @@ public class Eval { overlappingFamilyStrings.add(sb.toString()); } System.out.println("Possibly overlapping families with two or more " - + "family members:"); + + "family members, including non-running relays:"); for (String s : overlappingFamilyStrings) { System.out.println(s); } @@ -206,10 +213,32 @@ public class Eval { extendedFamilyStrings.add(sb.toString()); } System.out.println("Extended families based on merging possibly " - + "overlapping families:"); + + "overlapping families, including non-running relays:"); for (String s : extendedFamilyStrings) { System.out.println(s); } + System.out.println(); + + /* Filter non-running relays from extended families. */ + SortedSet<String> extendedFamilyRunningRelaysStrings = + new TreeSet<String>(); + for (SortedSet<String> extendedFamily : extendedFamilies) { + StringBuilder sb = new StringBuilder(); + int written = 0; + for (String relay : extendedFamily) { + if (runningRelays.contains(relay)) { + sb.append((written++ > 0 ? " " : "") + relay); + } + } + if (written > 1) { + extendedFamilyRunningRelaysStrings.add(sb.toString()); + } + } + System.out.println("Extended families, excluding non-running relays " + + "that may previously have helped merge overlapping families:"); + for (String s : extendedFamilyRunningRelaysStrings) { + System.out.println(s); + } } }

1 0

[metrics-tasks/master] Add script to group relays by families (#6662).
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit a7cbaa7e58ad0d8e7fda373e3d4b88b695bb7545 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 24 12:47:11 2012 +0200 Add script to group relays by families (#6662). --- task-6662/.classpath | 6 ++ task-6662/.project | 17 ++++ task-6662/Eval.java | 215 ++++++++++++++++++++++++++++++++++++++++++++++++++ task-6662/README | 2 + 4 files changed, 240 insertions(+), 0 deletions(-) diff --git a/task-6662/.classpath b/task-6662/.classpath new file mode 100644 index 0000000..233be1d --- /dev/null +++ b/task-6662/.classpath @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path=""/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path=""/> +</classpath> diff --git a/task-6662/.project b/task-6662/.project new file mode 100644 index 0000000..36b9f76 --- /dev/null +++ b/task-6662/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>family</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/task-6662/Eval.java b/task-6662/Eval.java new file mode 100644 index 0000000..5359fba --- /dev/null +++ b/task-6662/Eval.java @@ -0,0 +1,215 @@ +import java.io.*; +import java.util.*; +public class Eval { + /* curl "https://onionoo.torproject.org/details?running=true&type=relay" > details.json */ + public static void main(String[] args) throws Exception { + + /* Parse relays and their families from details.json. Also create a + * list of Named relays. */ + BufferedReader br = new BufferedReader(new FileReader( + "details.json")); + String line; + Set<String> family = new HashSet<String>(); + String nickname = null, fingerprint = null; + boolean isParsingFamily = false; + SortedMap<String, Set<String>> listedRelays = + new TreeMap<String, Set<String>>(); + Map<String, String> nicknames = new HashMap<String, String>(); + Map<String, String> namedRelays = new HashMap<String, String>(); + Set<String> unnamedRelays = new HashSet<String>(); + while ((line = br.readLine()) != null) { + if (isParsingFamily) { + if (line.startsWith(" ")) { + family.add(line.split("\"")[1]); + } else { + listedRelays.put(fingerprint, family); + family = new HashSet<String>(); + isParsingFamily = false; + } + } + if (line.startsWith("{\"nickname\":")) { + nickname = line.split(":")[1].split("\"")[1]; + } else if (line.startsWith("\"fingerprint\":")) { + fingerprint = "$" + line.split(":")[1].split("\"")[1]; + nicknames.put(fingerprint, nickname); + } else if (line.startsWith("\"flags\":")) { + if (line.contains("\"Named\"")) { + if (namedRelays.containsKey(nickname)) { + System.err.println("Two named relays with same nickname: '" + + nickname + "'. Exiting."); + System.exit(1); + } + namedRelays.put(nickname, fingerprint); + } else { + unnamedRelays.add(nickname); + } + } else if (line.equals("\"family\":[")) { + isParsingFamily = true; + } + } + br.close(); + + /* Print out unconfirmed families reported by relays, possibly + * containing nicknames of unnamed relays. */ + SortedSet<String> unconfirmedFamilyStrings = new TreeSet<String>(); + System.out.println("Complete family relationships as reported by " + + "running relays, not mutually confirmed and possibly " + + "containing nicknames of unnamed relays:"); + for (Map.Entry<String, Set<String>> e : listedRelays.entrySet()) { + StringBuilder sb = new StringBuilder(); + sb.append(nicknames.get(e.getKey()) + "~" + + e.getKey().substring(1, 5) + " ->"); + for (String member : e.getValue()) { + if (member.startsWith("$")) { + sb.append(" " + (nicknames.containsKey(member) ? + nicknames.get(member) : "(not-running)") + "~" + + member.substring(1, 5)); + } else { + sb.append(" " + member + "~" + + (namedRelays.containsKey(member) ? + namedRelays.get(member).substring(1, 5) : + (unnamedRelays.contains(member) ? "(unnamed)" : + "(not-running)"))); + } + } + unconfirmedFamilyStrings.add(sb.toString()); + } + for (String s : unconfirmedFamilyStrings) { + System.out.println(s); + } + System.out.println(); + + /* Determine mutually confirmed families with two or more family + * members. */ + SortedMap<String, SortedSet<String>> confirmedRelays = + new TreeMap<String, SortedSet<String>>(); + for (Map.Entry<String, Set<String>> e : listedRelays.entrySet()) { + SortedSet<String> confirmedMembers = new TreeSet<String>(); + String ownFingerprint = e.getKey(); + String ownNickname = nicknames.get(e.getKey()); + String ownRelayString = ownNickname + "~" + + ownFingerprint.substring(1, 5); + for (String member : e.getValue()) { + String memberNickname = null, memberFingerprint = null; + if (!member.startsWith("$") && + namedRelays.containsKey(member) && + listedRelays.containsKey(namedRelays.get(member))) { + /* member is the nickname of a named relay. */ + memberNickname = member; + memberFingerprint = namedRelays.get(member); + } else if (member.startsWith("$") && + listedRelays.containsKey(member)) { + /* member is the fingerprint of a running relay. */ + memberNickname = nicknames.get(member); + memberFingerprint = member; + } + if (memberFingerprint == null) { + continue; + } + String memberRelayString = memberNickname + "~" + + memberFingerprint.substring(1, 5); + Set<String> otherMembers = listedRelays.get(memberFingerprint); + if (otherMembers != null && (otherMembers.contains(ownFingerprint) || + otherMembers.contains(ownNickname)) && + !(ownRelayString.equals(memberRelayString))) { + confirmedMembers.add(memberRelayString); + } + } + if (!confirmedMembers.isEmpty()) { + confirmedRelays.put(e.getKey(), confirmedMembers); + } + } + SortedSet<String> confirmedFamilyStrings = new TreeSet<String>(); + for (Map.Entry<String, SortedSet<String>> e : + confirmedRelays.entrySet()) { + StringBuilder sb = new StringBuilder(); + sb.append(nicknames.get(e.getKey()) + "~" + + e.getKey().substring(1, 5) + " ->"); + for (String member : e.getValue()) { + sb.append(" " + member); + } + confirmedFamilyStrings.add(sb.toString()); + } + System.out.println("Mutually confirmed families with two or more " + + "family members, without reporting relay itself"); + for (String s : confirmedFamilyStrings) { + System.out.println(s); + } + System.out.println(); + + /* Determine possibly overlapping families with two or more family + * members. */ + Set<SortedSet<String>> overlappingFamilies = + new HashSet<SortedSet<String>>(); + for (Map.Entry<String, SortedSet<String>> e : + confirmedRelays.entrySet()) { + SortedSet<String> overlappingFamily = new TreeSet<String>(); + overlappingFamily.add(nicknames.get(e.getKey()) + "~" + + e.getKey().substring(1, 5)); + overlappingFamily.addAll(e.getValue()); + overlappingFamilies.add(overlappingFamily); + } + SortedSet<String> overlappingFamilyStrings = new TreeSet<String>(); + for (SortedSet<String> overlappingFamily : overlappingFamilies) { + if (overlappingFamily.size() < 2) { + continue; + } + int written = 0; + StringBuilder sb = new StringBuilder(); + for (String member : overlappingFamily) { + sb.append((written++ > 0 ? " " : "") + member); + } + overlappingFamilyStrings.add(sb.toString()); + } + System.out.println("Possibly overlapping families with two or more " + + "family members:"); + for (String s : overlappingFamilyStrings) { + System.out.println(s); + } + System.out.println(); + + /* Merge possibly overlapping families into extended families. */ + Set<SortedSet<String>> extendedFamilies = + new HashSet<SortedSet<String>>(); + for (SortedSet<String> overlappingFamily : overlappingFamilies) { + SortedSet<String> newExtendedFamily = + new TreeSet<String>(overlappingFamily); + Set<SortedSet<String>> removeExtendedFamilies = + new HashSet<SortedSet<String>>(); + for (SortedSet<String> extendedFamily : extendedFamilies) { + for (String member : newExtendedFamily) { + if (extendedFamily.contains(member)) { + removeExtendedFamilies.add(extendedFamily); + break; + } + } + if (removeExtendedFamilies.contains(extendedFamily)) { + newExtendedFamily.addAll(extendedFamily); + } + } + for (SortedSet<String> removeExtendedFamily : + removeExtendedFamilies) { + extendedFamilies.remove(removeExtendedFamily); + } + extendedFamilies.add(newExtendedFamily); + } + SortedSet<String> extendedFamilyStrings = new TreeSet<String>(); + for (SortedSet<String> extendedFamily : extendedFamilies) { + if (extendedFamily.size() < 2) { + continue; + } + int written = 0; + StringBuilder sb = new StringBuilder(); + for (String member : extendedFamily) { + sb.append((written++ > 0 ? " " : "") + member); + } + extendedFamilyStrings.add(sb.toString()); + } + System.out.println("Extended families based on merging possibly " + + "overlapping families:"); + for (String s : extendedFamilyStrings) { + System.out.println(s); + } + } +} + diff --git a/task-6662/README b/task-6662/README new file mode 100644 index 0000000..87177f7 --- /dev/null +++ b/task-6662/README @@ -0,0 +1,2 @@ +Script to group relays by families +

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 24 Aug '12

24 Aug '12

commit f381cdeb28dc03ff4836c4b8ea32aa6ff20b100a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 24 09:15:56 2012 +0000 Update translations for https_everywhere_completed --- templates/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ssl-observatory.dtd b/templates/ssl-observatory.dtd index 37e6cce..9457a96 100644 --- a/templates/ssl-observatory.dtd +++ b/templates/ssl-observatory.dtd @@ -34,9 +34,9 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Check certificates using Tor for anonymity (requires Torbutton)"> +"Check certificates using Tor for anonymity (requires Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"This option requires Tor and Torbutton to be installed"> +"This option requires Tor to be installed and running"> <!ENTITY ssl-observatory.prefs.asn "When you see a new certificate, tell the Observatory which ISP you are connected to">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Aug '12

24 Aug '12

commit f5814098920f9621e3e6a86bd9ea2badb92ae8fd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Aug 24 09:15:48 2012 +0000 Update translations for https_everywhere --- templates/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ssl-observatory.dtd b/templates/ssl-observatory.dtd index 37e6cce..9457a96 100644 --- a/templates/ssl-observatory.dtd +++ b/templates/ssl-observatory.dtd @@ -34,9 +34,9 @@ intrusive corporate network:"> <!ENTITY ssl-observatory.prefs.anonymous "Check certificates using Tor for anonymity"> <!ENTITY ssl-observatory.prefs.anonymous_unavailable -"Check certificates using Tor for anonymity (requires Torbutton)"> +"Check certificates using Tor for anonymity (requires Tor)"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"This option requires Tor and Torbutton to be installed"> +"This option requires Tor to be installed and running"> <!ENTITY ssl-observatory.prefs.asn "When you see a new certificate, tell the Observatory which ISP you are connected to">

1 0

[metrics-web/master] Fix typo in fast-exits graph legend.
by karsten＠torproject.org 24 Aug '12

24 Aug '12

commit 79d72ece9c8fb17d40e283a4de9f842bc4af1c50 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Aug 24 09:17:53 2012 +0200 Fix typo in fast-exits graph legend. --- rserve/graphs.R | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index c5712cd..1379691 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -939,7 +939,7 @@ plot_fast_exits <- function(start, end, path, dpi) { scale_x_date(name = "") + scale_y_continuous(name = "") + scale_colour_manual(values = c("purple", "orange")) + - opts(title = paste("Fast exits (95+ Mbit/s configured bandwidth", + opts(title = paste("Fast exits (95+ Mbit/s configured bandwidth ", "rate,\n5000+ KB/s advertised bandwidth capacity,\n", "exit to ports 80, 443, 554, and 1755,\n", "at most 2 relays per /24 network)\n", sep = ""))

1 0

[torspec/master] Fix misleading SETCIRCUITPURPOSE format
by nickm＠torproject.org 23 Aug '12

23 Aug '12

commit 777ddbfce74cc29205702b0f1e78ac8f87cf9765 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Thu Aug 23 21:18:00 2012 +0530 Fix misleading SETCIRCUITPURPOSE format --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 1625aa9..c5eeb19 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -761,7 +761,7 @@ 3.11. SETCIRCUITPURPOSE Sent from the client to the server. The format is: - "SETCIRCUITPURPOSE" SP CircuitID SP Purpose CRLF + "SETCIRCUITPURPOSE" SP CircuitID SP "purpose=" Purpose CRLF This changes the circuit's purpose. See EXTENDCIRCUIT above for details.

1 0