January 2016 - tor-commits - lists.torproject.org

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 17 Jan '16

17 Jan '16

commit 5cb1110e3bcbb5f0ebdbb700dfcb25856eddb92e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 17 18:16:10 2016 +0000 Update translations for tails-perl5lib --- sv.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index 71aaa90..9a82594 100644 --- a/sv.po +++ b/sv.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Anders Nilsson <locally(a)devode.se>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-17 17:55+0000\n" +"Last-Translator: Anders Nilsson <locally(a)devode.se>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "Fel" #: ../lib/Tails/RunningSystem.pm:161 msgid "" @@ -31,4 +32,4 @@ msgstr "Kunde inte hitta den enhet Tails körs ifrån. Kanske du startade med `t msgid "" "The drive Tails is running from cannot be found. Maybe you used the `toram' " "option?" -msgstr "" +msgstr "Kunde inte hitta den enhet Tails körs ifrån. Kanske du startade med `toram'?"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 17 Jan '16

17 Jan '16

commit 5244234668fe02a65859966318303622040cb501 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 17 18:15:54 2016 +0000 Update translations for tails-misc_completed --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index e82d748..4aab887 100644 --- a/sv.po +++ b/sv.po @@ -8,7 +8,7 @@ # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Gabor Sebastiani, 2014 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 -# Martin ‌ <mhilgendrf(a)aol.com>, 2016 +# Martin <mhilgendrf(a)aol.com>, 2016 # Michael Cavén, 2014 # ph AA, 2015 # phst <transifex(a)sturman.se>, 2015 @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-09 20:55+0000\n" -"Last-Translator: Martin ‌ <mhilgendrf(a)aol.com>\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-17 17:54+0000\n" +"Last-Translator: Martin <mhilgendrf(a)aol.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 17 Jan '16

17 Jan '16

commit fb8ca63534f39c0e4dac5bf809d9e206d68802ef Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 17 18:15:50 2016 +0000 Update translations for tails-misc --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index e82d748..4aab887 100644 --- a/sv.po +++ b/sv.po @@ -8,7 +8,7 @@ # Filip Nyquist <fillerix(a)fillerix.se>, 2015 # Gabor Sebastiani, 2014 # falk3n <johan.falkenstrom(a)gmail.com>, 2014 -# Martin ‌ <mhilgendrf(a)aol.com>, 2016 +# Martin <mhilgendrf(a)aol.com>, 2016 # Michael Cavén, 2014 # ph AA, 2015 # phst <transifex(a)sturman.se>, 2015 @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-09 20:55+0000\n" -"Last-Translator: Martin ‌ <mhilgendrf(a)aol.com>\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-17 17:54+0000\n" +"Last-Translator: Martin <mhilgendrf(a)aol.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Jan '16

17 Jan '16

commit 991cc7fc1c9d652a5d246874b570218f60f6a1fd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 17 18:15:29 2016 +0000 Update translations for tails-persistence-setup_completed --- sv/sv.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 208c66c..c24cecd 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-17 17:54+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -129,71 +129,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Konfigurera bestående lagring för Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Fel" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Enhet %s innehåller redan en partition med bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Enhet %s saknar tillräckligt med opartitionerat utrymme." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Enhet %s innehåller ingen partition för bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Partitionen med bestående lagring kan inte tas bort när den används. Starta om Tails utan bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Partitionen med bestående lagring är inte upplåst." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Partitionen med bestående lagring är inte monterad." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Kunde inte läsa ifrån den bestående lagringen. Saknas nödvändiga rättigheter?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Skrivåtkomst till den bestående lagringen saknas. Kanske den är skrivskyddad?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails körs från icke-USB / icke-SDIO enheten %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Enheten %s är optisk." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Din enhet %s är inte skapad av Tails installerare." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Guiden avslutad" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -245,32 +245,33 @@ msgstr "Lösenordet får inte vara tomt" msgid "Passphrases do not match" msgstr "Lösenorden matchar inte" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Misslyckades" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Monterar Tails-partition med bestående lagring." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Tails partition med bestående lagring kommer att monteras." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Rättar till behörigheterna på den bestående lagringen." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Behörigheterna på den bestående lagringen kommer att rättas till." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Skapar..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Skapar partition för bestående lagring..." @@ -320,10 +321,10 @@ msgstr "Partitionen %s (%s) med bestående lagring, på enheten <b>%s %s</b>, ko msgid "Delete" msgstr "Ta bort" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Tar bort..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Tar bort den bestående lagringen..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Jan '16

17 Jan '16

commit 33bc0f84355d8cdb9febc2682a7b382192c718af Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 17 18:15:23 2016 +0000 Update translations for tails-persistence-setup --- sv/sv.po | 53 +++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/sv/sv.po b/sv/sv.po index 208c66c..c24cecd 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2015-12-14 21:35+0100\n" -"PO-Revision-Date: 2015-12-15 09:27+0000\n" +"POT-Creation-Date: 2015-12-16 17:55+0100\n" +"PO-Revision-Date: 2016-01-17 17:54+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -129,71 +129,71 @@ msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" msgstr "Länka in i $HOME varje fil och katalog som finns i `dotfiles' katalogen" -#: ../lib/Tails/Persistence/Setup.pm:227 +#: ../lib/Tails/Persistence/Setup.pm:230 msgid "Setup Tails persistent volume" msgstr "Konfigurera bestående lagring för Tails" -#: ../lib/Tails/Persistence/Setup.pm:307 ../lib/Tails/Persistence/Setup.pm:451 +#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458 msgid "Error" msgstr "Fel" -#: ../lib/Tails/Persistence/Setup.pm:338 +#: ../lib/Tails/Persistence/Setup.pm:343 #, perl-format msgid "Device %s already has a persistent volume." msgstr "Enhet %s innehåller redan en partition med bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:346 +#: ../lib/Tails/Persistence/Setup.pm:351 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "Enhet %s saknar tillräckligt med opartitionerat utrymme." -#: ../lib/Tails/Persistence/Setup.pm:354 ../lib/Tails/Persistence/Setup.pm:368 +#: ../lib/Tails/Persistence/Setup.pm:359 ../lib/Tails/Persistence/Setup.pm:373 #, perl-format msgid "Device %s has no persistent volume." msgstr "Enhet %s innehåller ingen partition för bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:360 +#: ../lib/Tails/Persistence/Setup.pm:365 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "Partitionen med bestående lagring kan inte tas bort när den används. Starta om Tails utan bestående lagring." -#: ../lib/Tails/Persistence/Setup.pm:379 +#: ../lib/Tails/Persistence/Setup.pm:384 msgid "Persistence volume is not unlocked." msgstr "Partitionen med bestående lagring är inte upplåst." -#: ../lib/Tails/Persistence/Setup.pm:384 +#: ../lib/Tails/Persistence/Setup.pm:389 msgid "Persistence volume is not mounted." msgstr "Partitionen med bestående lagring är inte monterad." -#: ../lib/Tails/Persistence/Setup.pm:389 +#: ../lib/Tails/Persistence/Setup.pm:394 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "Kunde inte läsa ifrån den bestående lagringen. Saknas nödvändiga rättigheter?" -#: ../lib/Tails/Persistence/Setup.pm:394 +#: ../lib/Tails/Persistence/Setup.pm:399 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "Skrivåtkomst till den bestående lagringen saknas. Kanske den är skrivskyddad?" -#: ../lib/Tails/Persistence/Setup.pm:403 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tails körs från icke-USB / icke-SDIO enheten %s." -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:414 #, perl-format msgid "Device %s is optical." msgstr "Enheten %s är optisk." -#: ../lib/Tails/Persistence/Setup.pm:416 +#: ../lib/Tails/Persistence/Setup.pm:421 #, perl-format msgid "Device %s was not created using Tails Installer." msgstr "Din enhet %s är inte skapad av Tails installerare." -#: ../lib/Tails/Persistence/Setup.pm:676 +#: ../lib/Tails/Persistence/Setup.pm:667 msgid "Persistence wizard - Finished" msgstr "Guiden avslutad" -#: ../lib/Tails/Persistence/Setup.pm:679 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -245,32 +245,33 @@ msgstr "Lösenordet får inte vara tomt" msgid "Passphrases do not match" msgstr "Lösenorden matchar inte" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 #: ../lib/Tails/Persistence/Step/Configure.pm:129 +#: ../lib/Tails/Persistence/Step/Delete.pm:95 msgid "Failed" msgstr "Misslyckades" -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:271 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "Mounting Tails persistence partition." msgstr "Monterar Tails-partition med bestående lagring." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:274 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 msgid "The Tails persistence partition will be mounted." msgstr "Tails partition med bestående lagring kommer att monteras." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:295 msgid "Correcting permissions of the persistent volume." msgstr "Rättar till behörigheterna på den bestående lagringen." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:286 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:298 msgid "The permissions of the persistent volume will be corrected." msgstr "Behörigheterna på den bestående lagringen kommer att rättas till." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:308 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:320 msgid "Creating..." msgstr "Skapar..." -#: ../lib/Tails/Persistence/Step/Bootstrap.pm:311 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:323 msgid "Creating the persistent volume..." msgstr "Skapar partition för bestående lagring..." @@ -320,10 +321,10 @@ msgstr "Partitionen %s (%s) med bestående lagring, på enheten <b>%s %s</b>, ko msgid "Delete" msgstr "Ta bort" -#: ../lib/Tails/Persistence/Step/Delete.pm:101 +#: ../lib/Tails/Persistence/Step/Delete.pm:111 msgid "Deleting..." msgstr "Tar bort..." -#: ../lib/Tails/Persistence/Step/Delete.pm:104 +#: ../lib/Tails/Persistence/Step/Delete.pm:114 msgid "Deleting the persistent volume..." msgstr "Tar bort den bestående lagringen..."

1 0

[translation/tor_animation] Update translations for tor_animation
by translation＠torproject.org 17 Jan '16

17 Jan '16

commit 30f5ea71bbc04e0ba600ed4d0d4e3c46fec360d9 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 17 15:15:58 2016 +0000 Update translations for tor_animation --- mr.srt | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/mr.srt b/mr.srt index 78c998d..844894f 100644 --- a/mr.srt +++ b/mr.srt @@ -17,7 +17,7 @@ places we go, and the stuff we read. 5 00:00:13,280 --> 00:00:14,640 -Let me explain it better. +मला नीट समजाऊ दे 6 00:00:14,920 --> 00:00:17,740 @@ -40,126 +40,126 @@ and so much more information about you and your life 10 -00:00:29,620 --> 00:00:32,460 +00:00:29,200 --> 00:00:31,500 which you probably didn't mean to share with unknown strangers, 11 -00:00:32,920 --> 00:00:35,840 +00:00:31,700 --> 00:00:34,000 who could easily use this data to exploit you. 12 -00:00:36,220 --> 00:00:38,120 +00:00:34,500 --> 00:00:37,000 But not if you're using Tor! 13 -00:00:39,140 --> 00:00:42,840 +00:00:37,140 --> 00:00:40,840 Tor Browser protects our privacy and identity on the Internet. 14 -00:00:43,560 --> 00:00:46,760 +00:00:41,560 --> 00:00:44,760 Tor secures your connection with three layers of encryption 15 -00:00:46,940 --> 00:00:51,760 +00:00:44,940 --> 00:00:49,760 and passes it through three voluntarily operated servers around the world, 16 -00:00:52,280 --> 00:00:55,520 +00:00:50,280 --> 00:00:53,520 which enables us to communicate anonymously over the Internet. 17 -00:00:58,560 --> 00:01:00,280 +00:00:56,560 --> 00:00:58,280 Tor also protects our data 18 -00:01:00,400 --> 00:01:03,900 +00:00:58,400 --> 00:01:01,900 against corporate or government targeted and mass surveillance. 19 -00:01:04,880 --> 00:01:09,340 +00:01:02,880 --> 00:01:07,340 Perhaps you live in a repressive country which tries to control and surveil the Internet. 20 -00:01:09,900 --> 00:01:13,800 +00:01:07,900 --> 00:01:11,800 Or perhaps you don't want big corporations taking advantage of your personal information. 21 -00:01:14,880 --> 00:01:17,640 +00:01:12,880 --> 00:01:15,640 Tor makes all of its users to look the same 22 -00:01:17,920 --> 00:01:20,800 +00:01:15,920 --> 00:01:18,800 which confuses the observer and makes you anonymous. 23 -00:01:21,500 --> 00:01:24,980 +00:01:19,500 --> 00:01:22,980 So, the more people use the Tor network, the stronger it gets 24 -00:01:25,140 --> 00:01:29,800 +00:01:23,140 --> 00:01:27,800 as it's easier to hide in a crowd of people who look exactly the same. 25 -00:01:30,700 --> 00:01:33,240 +00:01:28,700 --> 00:01:31,240 You can bypass the censorship without being worried about 26 -00:01:33,400 --> 00:01:36,100 +00:01:31,400 --> 00:01:34,100 the censor knowing what you do on the Internet. 27 -00:01:38,540 --> 00:01:41,440 +00:01:36,540 --> 00:01:39,440 The ads won't follow you everywhere for months, 28 -00:01:41,640 --> 00:01:43,300 +00:01:39,640 --> 00:01:41,300 starting when you first clicked on a product. 29 -00:01:45,880 --> 00:01:49,380 +00:01:43,880 --> 00:01:47,380 By using Tor, the sites you visit won't even know who you are, 30 -00:01:49,540 --> 00:01:51,760 +00:01:47,540 --> 00:01:49,760 from what part of the world you're visiting them, 31 -00:01:51,920 --> 00:01:53,920 +00:01:49,920 --> 00:01:51,920 unless you login and tell them so. 32 -00:01:56,200 --> 00:01:57,840 +00:01:54,200 --> 00:01:55,840 By downloading and using Tor, 33 -00:01:58,200 --> 00:02:00,560 +00:01:56,200 --> 00:01:58,560 you can protect the people who need anonymity, 34 -00:02:00,880 --> 00:02:03,640 +00:01:58,880 --> 00:02:01,640 like activists, journalists and bloggers. 35 -00:02:04,000 --> 00:02:09,000 +00:02:02,000 --> 00:02:07,000 Download and use Tor! Or run a relay!

1 0

[stem/master] Benchmarks for our descriptor parsing libraries
by atagar＠torproject.org 17 Jan '16

17 Jan '16

commit 6dd30e5beda287cd02fabd257028e1711aa63f99 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 16 19:18:25 2016 -0800 Benchmarks for our descriptor parsing libraries Karsten, Philipp, and I have been discussing library benchmarks on tor-dev@. Adding the findings... https://lists.torproject.org/pipermail/tor-dev/2016-January/010230.html --- docs/_static/example/benchmark_metrics_lib.java | 302 ++++++++++++++++++++ .../benchmark_server_descriptor_metrics_lib.java | 49 ++++ .../example/benchmark_server_descriptor_stem.py | 21 ++ .../example/benchmark_server_descriptor_zoossh.go | 68 +++++ docs/_static/example/benchmark_stem.py | 81 ++++++ docs/_static/example/benchmark_zoossh.go | 120 ++++++++ docs/tutorials/mirror_mirror_on_the_wall.rst | 96 +++++-- 7 files changed, 712 insertions(+), 25 deletions(-) diff --git a/docs/_static/example/benchmark_metrics_lib.java b/docs/_static/example/benchmark_metrics_lib.java new file mode 100644 index 0000000..63b5e4b --- /dev/null +++ b/docs/_static/example/benchmark_metrics_lib.java @@ -0,0 +1,302 @@ +/* Copyright 2016 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +import java.io.File; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; +import java.util.SortedMap; + +public class MeasurePerformance { + + /* Check if all necessary files are available and then measure + * performance of some more or less common use cases. */ + public static void main(String[] args) { + if (!filesAvailable()) { + return; + } + /*measureListOutdatedRelays(null); + pause();*/ + measureAverageAdvertisedBandwidth(new File(resDir, resPaths[0])); + pause(); + measureAverageAdvertisedBandwidth(new File(resDir, resPaths[1])); + pause(); + measureAverageAdvertisedBandwidth(new File(resDir, resPaths[2])); + pause(); + /*measureFractionRelaysExit80ServerDescriptors(null); + pause(); + measureSumOfWrittenAndReadBytes(null); + pause();*/ + measureCountriesV3Requests(new File(resDir, resPaths[3])); + pause(); + measureCountriesV3Requests(new File(resDir, resPaths[4])); + pause(); + measureAverageRelaysExit(new File(resDir, resPaths[5])); + pause(); + measureAverageRelaysExit(new File(resDir, resPaths[6])); + pause(); + measureAverageRelaysExit(new File(resDir, resPaths[7])); + /*pause(); + measureVotesByBandwidthAuthorities(null); + pause(); + measureExtendedFamilies(null); + pause();*/ + measureFractionRelaysExit80Microdescriptors( + new File(resDir, resPaths[8])); + measureFractionRelaysExit80Microdescriptors( + new File(resDir, resPaths[9])); + } + + private static File resDir = new File("res"); + private static String[] resPaths = new String[] { + "archive/relay-descriptors/server-descriptors/" + + "server-descriptors-2015-11.tar.xz", + "archive/relay-descriptors/server-descriptors/" + + "server-descriptors-2015-11.tar", + "archive/relay-descriptors/server-descriptors/" + + "server-descriptors-2015-11", + "archive/relay-descriptors/extra-infos/extra-infos-2015-11.tar.xz", + "archive/relay-descriptors/extra-infos/extra-infos-2015-11.tar", + "archive/relay-descriptors/consensuses/consensuses-2015-11.tar.xz", + "archive/relay-descriptors/consensuses/consensuses-2015-11.tar", + "archive/relay-descriptors/consensuses/consensuses-2015-11", + "archive/relay-descriptors/microdescs/" + + "microdescs-2015-11-micro.tar.xz", + "archive/relay-descriptors/microdescs/microdescs-2015-11-micro.tar" + }; + + private static boolean filesAvailable() { + if (!resDir.exists() || !resDir.isDirectory()) { + return false; + } + for (String resPath : resPaths) { + if (!(new File(resDir, resPath).exists())) { + System.err.println(resPath); + return false; + } + } + return true; + } + + private static void pause() { + try { + Thread.sleep(15L * 1000L); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + + private static void measureListOutdatedRelays(File tarballFile) { + + } + + private static void measureAverageAdvertisedBandwidth( + File tarballFileOrDirectory) { + System.out.println("Starting measureAverageAdvertisedBandwidth"); + long startedMillis = System.currentTimeMillis(); + long sumAdvertisedBandwidth = 0, countedServerDescriptors = 0; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addTarball(tarballFileOrDirectory); + descriptorReader.addDirectory(tarballFileOrDirectory); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof ServerDescriptor)) { + continue; + } + ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; + sumAdvertisedBandwidth += (long) Math.min(Math.min( + serverDescriptor.getBandwidthRate(), + serverDescriptor.getBandwidthBurst()), + serverDescriptor.getBandwidthObserved()); + countedServerDescriptors++; + } + } + long endedMillis = System.currentTimeMillis(); + System.out.println("Ending measureAverageAdvertisedBandwidth"); + System.out.printf("Total time: %d millis%n", + endedMillis - startedMillis); + System.out.printf("Processed server descriptors: %d%n", + countedServerDescriptors); + System.out.printf("Average advertised bandwidth: %d%n", + sumAdvertisedBandwidth / countedServerDescriptors); + System.out.printf("Time per server descriptor: %.6f millis%n", + ((double) (endedMillis - startedMillis)) + / ((double) countedServerDescriptors)); + } + + private static void measureFractionRelaysExit80ServerDescriptors( + File tarballFile) { + + } + + private static void measureSumOfWrittenAndReadBytes(File tarballFile) { + + } + + private static void measureCountriesV3Requests(File tarballFile) { + System.out.println("Starting measureCountriesV3Requests"); + long startedMillis = System.currentTimeMillis(); + Set<String> countries = new HashSet<>(); + long countedExtraInfoDescriptors = 0; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addTarball(tarballFile); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof ExtraInfoDescriptor)) { + continue; + } + ExtraInfoDescriptor extraInfoDescriptor = + (ExtraInfoDescriptor) descriptor; + SortedMap<String, Integer> dirreqV3Reqs = + extraInfoDescriptor.getDirreqV3Reqs(); + if (dirreqV3Reqs != null) { + countries.addAll(dirreqV3Reqs.keySet()); + } + countedExtraInfoDescriptors++; + } + } + long endedMillis = System.currentTimeMillis(); + System.out.println("Ending measureCountriesV3Requests"); + System.out.printf("Total time: %d millis%n", + endedMillis - startedMillis); + System.out.printf("Processed extra-info descriptors: %d%n", + countedExtraInfoDescriptors); + System.out.printf("Number of countries: %d%n", + countries.size()); + System.out.printf("Time per extra-info descriptor: %.6f millis%n", + ((double) (endedMillis - startedMillis)) + / ((double) countedExtraInfoDescriptors)); + } + + private static void measureAverageRelaysExit( + File tarballFileOrDirectory) { + System.out.println("Starting measureAverageRelaysExit"); + long startedMillis = System.currentTimeMillis(); + long totalRelaysWithExitFlag = 0L, totalRelays = 0L, + countedConsensuses = 0L; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addTarball(tarballFileOrDirectory); + descriptorReader.addDirectory(tarballFileOrDirectory); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof RelayNetworkStatusConsensus)) { + continue; + } + RelayNetworkStatusConsensus consensus = + (RelayNetworkStatusConsensus) descriptor; + for (NetworkStatusEntry entry : + consensus.getStatusEntries().values()) { + if (entry.getFlags().contains("Exit")) { + totalRelaysWithExitFlag++; + } + totalRelays++; + } + countedConsensuses++; + } + } + long endedMillis = System.currentTimeMillis(); + System.out.println("Ending measureAverageRelaysExit"); + System.out.printf("Total time: %d millis%n", + endedMillis - startedMillis); + System.out.printf("Processed consensuses: %d%n", countedConsensuses); + System.out.printf("Total number of status entries: %d%n", + totalRelays); + System.out.printf("Total number of status entries with Exit flag: " + + "%d%n", totalRelaysWithExitFlag); + System.out.printf("Average number of relays with Exit Flag: %.2f%n", + (double) totalRelaysWithExitFlag / (double) totalRelays); + System.out.printf("Time per consensus: %.6f millis%n", + ((double) (endedMillis - startedMillis)) + / ((double) countedConsensuses)); + } + + private static void measureVotesByBandwidthAuthorities( + File tarballFile) { + + } + + private static void measureExtendedFamilies(File tarballFile) { + + } + + private static void measureFractionRelaysExit80Microdescriptors( + File tarballFile) { + System.out.println("Starting " + + "measureFractionRelaysExit80Microdescriptors"); + long startedMillis = System.currentTimeMillis(); + long totalRelaysWithExitFlag = 0L, countedMicrodescriptors = 0L; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addTarball(tarballFile); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof Microdescriptor)) { + continue; + } + countedMicrodescriptors++; + Microdescriptor microdescriptor = + (Microdescriptor) descriptor; + String defaultPolicy = microdescriptor.getDefaultPolicy(); + if (defaultPolicy == null) { + continue; + } + boolean accept = "accept".equals( + microdescriptor.getDefaultPolicy()); + for (String ports : microdescriptor.getPortList().split(",")) { + if (ports.contains("-")) { + String[] parts = ports.split("-"); + int from = Integer.parseInt(parts[0]); + int to = Integer.parseInt(parts[1]); + if (from <= 80 && to >= 80) { + if (accept) { + totalRelaysWithExitFlag++; + } + } else if (to > 80) { + if (!accept) { + totalRelaysWithExitFlag++; + } + break; + } + } else if ("80".equals(ports)) { + if (accept) { + totalRelaysWithExitFlag++; + } + break; + } + } + } + } + long endedMillis = System.currentTimeMillis(); + System.out.println("Ending " + + "measureFractionRelaysExit80Microdescriptors"); + System.out.printf("Total time: %d millis%n", + endedMillis - startedMillis); + System.out.printf("Processed microdescriptors: %d%n", + countedMicrodescriptors); + System.out.printf("Total number of microdescriptors that exit to 80: " + + "%d%n", totalRelaysWithExitFlag); + System.out.printf("Average number of relays that exit to 80: %.2f%n", + (double) totalRelaysWithExitFlag + / (double) countedMicrodescriptors); + System.out.printf("Time per microdescriptor: %.6f millis%n", + ((double) (endedMillis - startedMillis)) + / ((double) countedMicrodescriptors)); + } +} + diff --git a/docs/_static/example/benchmark_server_descriptor_metrics_lib.java b/docs/_static/example/benchmark_server_descriptor_metrics_lib.java new file mode 100644 index 0000000..efb8634 --- /dev/null +++ b/docs/_static/example/benchmark_server_descriptor_metrics_lib.java @@ -0,0 +1,49 @@ +package org.torproject.descriptor; + +import java.io.File; +import java.util.Iterator; +import org.torproject.descriptor.DescriptorSourceFactory; + +public class MeasurePerformance { + public static void main(String[] args) { + measureAverageAdvertisedBandwidth(new File("server-descriptors-2015-11.tar")); + } + + private static void measureAverageAdvertisedBandwidth( + File tarballFileOrDirectory) { + System.out.println("Starting measureAverageAdvertisedBandwidth"); + long startedMillis = System.currentTimeMillis(); + long sumAdvertisedBandwidth = 0, countedServerDescriptors = 0; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addTarball(tarballFileOrDirectory); + descriptorReader.addDirectory(tarballFileOrDirectory); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof ServerDescriptor)) { + continue; + } + ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; + sumAdvertisedBandwidth += (long) Math.min(Math.min( + serverDescriptor.getBandwidthRate(), + serverDescriptor.getBandwidthBurst()), + serverDescriptor.getBandwidthObserved()); + countedServerDescriptors++; + } + } + long endedMillis = System.currentTimeMillis(); + System.out.println("Ending measureAverageAdvertisedBandwidth"); + System.out.printf("Total time: %d millis%n", + endedMillis - startedMillis); + System.out.printf("Processed server descriptors: %d%n", + countedServerDescriptors); + System.out.printf("Average advertised bandwidth: %d%n", + sumAdvertisedBandwidth / countedServerDescriptors); + System.out.printf("Time per server descriptor: %.6f millis%n", + ((double) (endedMillis - startedMillis)) + / ((double) countedServerDescriptors)); + } +} diff --git a/docs/_static/example/benchmark_server_descriptor_stem.py b/docs/_static/example/benchmark_server_descriptor_stem.py new file mode 100644 index 0000000..c475652 --- /dev/null +++ b/docs/_static/example/benchmark_server_descriptor_stem.py @@ -0,0 +1,21 @@ +import time +import stem.descriptor + +def measure_average_advertised_bandwidth(path): + start_time = time.time() + total_bw, count = 0, 0 + + for desc in stem.descriptor.parse_file(path): + total_bw += min(desc.average_bandwidth, desc.burst_bandwidth, desc.observed_bandwidth) + count += 1 + + runtime = time.time() - start_time + print("Finished measure_average_advertised_bandwidth('%s')" % path) + print(' Total time: %i seconds' % runtime) + print(' Processed server descriptors: %i' % count) + print(' Average advertised bandwidth: %i' % (total_bw / count)) + print(' Time per server descriptor: %0.5f seconds' % (runtime / count)) + print('') + +if __name__ == '__main__': + measure_average_advertised_bandwidth('server-descriptors-2015-11.tar') diff --git a/docs/_static/example/benchmark_server_descriptor_zoossh.go b/docs/_static/example/benchmark_server_descriptor_zoossh.go new file mode 100644 index 0000000..f72b3fb --- /dev/null +++ b/docs/_static/example/benchmark_server_descriptor_zoossh.go @@ -0,0 +1,68 @@ +package main + +import ( + "fmt" + "os" + "path/filepath" + "time" + + "git.torproject.org/user/phw/zoossh.git" +) + +var processedDescs int64 = 0 +var totalBw uint64 = 0 + +func Min(a uint64, b uint64, c uint64) uint64 { + min := a + + if b < min { + min = b + } + + if c < min { + min = c + } + + return min +} + +func ProcessDescriptors(path string, info os.FileInfo, err error) error { + if _, err := os.Stat(path); err != nil { + return err + } + + if info.IsDir() { + return nil + } + + consensus, err := zoossh.ParseDescriptorFile(path) + if err != nil { + return err + } + + if (processedDescs % 100) == 0 { + fmt.Printf(".") + } + + for _, getDesc := range consensus.RouterDescriptors { + desc := getDesc() + totalBw += Min(desc.BandwidthAvg, desc.BandwidthBurst, desc.BandwidthObs) + processedDescs++ + } + + return nil +} + +func main() { + before = time.Now() + filepath.Walk("server-descriptors-2015-11", ProcessDescriptors) + fmt.Println() + after = time.Now() + + duration = after.Sub(before) + fmt.Println("Total time for descriptors:", duration) + fmt.Printf("Time per descriptor: %dns\n", + duration.Nanoseconds()/processedDescs) + fmt.Printf("Processed %d descriptors.\n", processedDescs) + fmt.Printf("Average advertised bandwidth: %d\n", totalBw/uint64(processedDescs)) +} diff --git a/docs/_static/example/benchmark_stem.py b/docs/_static/example/benchmark_stem.py new file mode 100644 index 0000000..8b71d73 --- /dev/null +++ b/docs/_static/example/benchmark_stem.py @@ -0,0 +1,81 @@ +import time +import stem.descriptor + +def measure_average_advertised_bandwidth(path): + start_time = time.time() + total_bw, count = 0, 0 + + for desc in stem.descriptor.parse_file(path): + total_bw += min(desc.average_bandwidth, desc.burst_bandwidth, desc.observed_bandwidth) + count += 1 + + runtime = time.time() - start_time + print("Finished measure_average_advertised_bandwidth('%s')" % path) + print(' Total time: %i seconds' % runtime) + print(' Processed server descriptors: %i' % count) + print(' Average advertised bandwidth: %i' % (total_bw / count)) + print(' Time per server descriptor: %0.5f seconds' % (runtime / count)) + print('') + +def measure_countries_v3_requests(path): + start_time = time.time() + countries, count = set(), 0 + + for desc in stem.descriptor.parse_file(path): + if desc.dir_v3_responses: + countries.update(desc.dir_v3_responses.keys()) + + count += 1 + + runtime = time.time() - start_time + print("Finished measure_countries_v3_requests('%s')" % path) + print(' Total time: %i seconds' % runtime) + print(' Processed extrainfo descriptors: %i' % count) + print(' Number of countries: %i' % len(countries)) + print(' Time per extrainfo descriptor: %0.5f seconds' % (runtime / count)) + print('') + +def measure_average_relays_exit(path): + start_time = time.time() + total_relays, exits, consensuses = 0, 0, 0 + + for consensus in stem.descriptor.parse_file(path, document_handler = stem.descriptor.DocumentHandler.DOCUMENT): + for desc in consensus.routers.values(): + if 'Exit' in desc.flags: + exits += 1 + + total_relays += 1 + + consensuses += 1 + + runtime = time.time() - start_time + print("Finished measure_average_relays_exit('%s')" % path) + print(' Total time: %i seconds' % runtime) + print(' Processed %i consensuses with %i router status entries' % (consensuses, total_relays)) + print(' Total exits: %i (%0.2f%%)' % (exits, float(exits) / total_relays)) + print(' Time per consensus: %0.5f seconds' % (runtime / consensuses)) + print('') + +def measure_fraction_relays_exit_80_microdescriptors(path): + start_time = time.time() + exits, count = 0, 0 + + for desc in stem.descriptor.parse_file(path): + if desc.exit_policy.can_exit_to(port = 80): + exits += 1 + + count += 1 + + runtime = time.time() - start_time + print("Finished measure_fraction_relays_exit_80_microdescriptors('%s')" % path) + print(' Total time: %i seconds' % runtime) + print(' Processed microdescriptors: %i' % count) + print(' Total exits to port 80: %i (%0.2f%%)' % (exits, float(exits) / count)) + print(' Time per microdescriptor: %0.5f seconds' % (runtime / count)) + print('') + +measure_average_advertised_bandwidth('/home/atagar/Desktop/server-descriptors-2015-11.tar') +measure_countries_v3_requests('/home/atagar/Desktop/extra-infos-2015-11.tar') +measure_average_relays_exit('/home/atagar/Desktop/consensuses-2015-11.tar') +measure_fraction_relays_exit_80_microdescriptors('/home/atagar/Desktop/microdescs-2015-11.tar') + diff --git a/docs/_static/example/benchmark_zoossh.go b/docs/_static/example/benchmark_zoossh.go new file mode 100644 index 0000000..7cfc04f --- /dev/null +++ b/docs/_static/example/benchmark_zoossh.go @@ -0,0 +1,120 @@ +package main + +import ( + "fmt" + "log" + "os" + "path/filepath" + "time" + + "git.torproject.org/user/phw/zoossh.git" +) + +var processedCons int64 = 0 +var processedDescs int64 = 0 +var totalExits int64 = 0 +var totalRelays int64 = 0 +var totalBw uint64 = 0 + +func Min(a uint64, b uint64, c uint64) uint64 { + + min := a + + if b < min { + min = b + } + + if c < min { + min = c + } + + return min +} + +func ProcessDescriptors(path string, info os.FileInfo, err error) error { + + if _, err := os.Stat(path); err != nil { + return err + } + + if info.IsDir() { + return nil + } + + consensus, err := zoossh.ParseDescriptorFile(path) + if err != nil { + return err + } + + if (processedDescs % 100) == 0 { + fmt.Printf(".") + } + + for _, getDesc := range consensus.RouterDescriptors { + desc := getDesc() + totalBw += Min(desc.BandwidthAvg, desc.BandwidthBurst, desc.BandwidthObs) + processedDescs++ + } + + return nil +} + +func ProcessConsensus(path string, info os.FileInfo, err error) error { + + if _, err := os.Stat(path); err != nil { + return err + } + + if info.IsDir() { + return nil + } + + consensus, err := zoossh.ParseConsensusFile(path) + if err != nil { + return err + } + fmt.Printf(".") + + for _, getStatus := range consensus.RouterStatuses { + status := getStatus() + totalRelays++ + if status.Flags.Exit == true { + totalExits++ + } + } + processedCons++ + + return nil +} + +func main() { + + if len(os.Args) != 3 { + log.Fatalf("Usage: %s CONSENSUS_ARCHIVE DESCRIPTOR_ARCHIVE", os.Args[0]) + } + + before := time.Now() + filepath.Walk(os.Args[1], ProcessConsensus) + fmt.Println() + after := time.Now() + + duration := after.Sub(before) + fmt.Println("Total time for consensuses:", duration) + fmt.Printf("Time per consensus: %dms\n", + duration.Nanoseconds()/processedCons/int64(1000000)) + fmt.Printf("Processed %d consensuses with %d router status entries.\n", + processedCons, totalRelays) + fmt.Printf("Total exits: %d\n", totalExits) + + before = time.Now() + filepath.Walk(os.Args[2], ProcessDescriptors) + fmt.Println() + after = time.Now() + + duration = after.Sub(before) + fmt.Println("Total time for descriptors:", duration) + fmt.Printf("Time per descriptor: %dns\n", + duration.Nanoseconds()/processedDescs) + fmt.Printf("Processed %d descriptors.\n", processedDescs) + fmt.Printf("Average advertised bandwidth: %d\n", totalBw/uint64(processedDescs)) +} diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index ee524e4..656d228 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -263,31 +263,77 @@ Each library has its own capabilities... .. role:: red .. role:: green -=========================== ================= =============== ============== -Capability Stem Metrics-lib Zoossh -=========================== ================= =============== ============== -Language :green:`Python` :green:`Java` :green:`Go` -Checks signatures :green:`Mostly` :red:`No` :red:`No` -Create new descriptors :red:`No` :red:`No` :red:`No` -Lazy parsing :green:`Yes` :red:`No` :green:`Yes` -Type detection by @type :green:`Yes` :green:`Yes` :green:`Yes` -Type detection by filename :green:`Yes` :red:`No` :red:`No` -Packages :green:`Several` :red:`None` :red:`None` +=========================== ===================== =================== ============== +Capability Stem Metrics-lib Zoossh +=========================== ===================== =================== ============== +Language :green:`Python` :green:`Java` :green:`Go` +Checks signatures :green:`Mostly` :red:`No` :red:`No` +Create new descriptors :red:`No` :red:`No` :red:`No` +Lazy parsing :green:`Yes` :red:`No` :green:`Yes` +Type detection by @type :green:`Yes` :green:`Yes` :green:`Yes` +Type detection by filename :green:`Yes` :red:`No` :red:`No` +Packages :green:`Several` :red:`None` :red:`None` **Can Read/Download From** -Files :green:`Yes` :green:`Yes` :green:`Yes` -Tarballs :green:`Yes` :green:`Yes` :red:`No` -Tor Process :green:`Yes` :red:`No` :red:`No` -Directory Authorities :green:`Yes` :green:`Yes` :red:`No` -CollecTor :red:`No` :green:`Yes` :red:`No` +Files :green:`Yes` :green:`Yes` :green:`Yes` +Tarballs :green:`Yes` :green:`Yes` :red:`No` +Tor Process :green:`Yes` :red:`No` :red:`No` +Directory Authorities :green:`Yes` :green:`Yes` :red:`No` +CollecTor :red:`No` :green:`Yes` :red:`No` **Supported Types** -Server Descriptors :green:`Yes` :green:`Yes` :green:`Partly` -Extrainfo Descriptors :green:`Yes` :green:`Yes` :red:`No` -Microdescriptors :green:`Yes` :green:`Yes` :red:`No` -Consensus :green:`Yes` :green:`Yes` :green:`Partly` -Bridge Descriptors :green:`Yes` :green:`Yes` :red:`No` -Hidden Service Descriptors :green:`Yes` :red:`No` :red:`No` -Bridge Pool Assignments :red:`No` :green:`Yes` :red:`No` -Torperf :red:`No` :green:`Yes` :red:`No` -Tordnsel :green:`Yes` :green:`Yes` :red:`No` -=========================== ================= =============== ============== +Server Descriptors :green:`Yes` :green:`Yes` :green:`Partly` +Extrainfo Descriptors :green:`Yes` :green:`Yes` :red:`No` +Microdescriptors :green:`Yes` :green:`Yes` :red:`No` +Consensus :green:`Yes` :green:`Yes` :green:`Partly` +Bridge Descriptors :green:`Yes` :green:`Yes` :red:`No` +Hidden Service Descriptors :green:`Yes` :red:`No` :red:`No` +Bridge Pool Assignments :red:`No` :green:`Yes` :red:`No` +Torperf :red:`No` :green:`Yes` :red:`No` +Tordnsel :green:`Yes` :green:`Yes` :red:`No` +**Benchmarks** +Server Descriptors :green:`0.63 ms` :green:`0.29 ms` :green:`0.46 ms` +Extrainfo Descriptors :green:`0.42 ms` :green:`0.22 ms` :red:`unsupported` +Microdescriptors :green:`0.34 ms` :green:`0.07 ms` :red:`unsupported` +Consensus :green:`876.09 ms` :green:`246.71 ms` :green:`83.00 ms` +Benchmarked With Commit :green:`c01a9cd` :green:`8767f3e` :green:`2380e55` +Language Interpreter :green:`Python 3.5.1` :green:`Java 1.7.0` :green:`Go 1.5.2` +=========================== ===================== =================== ============== + +Few things to note about these benchmarks... + +* **Zoossh is the fastest.** Its benchmarks were at a disadvantage due to not + reading from tarballs. + +* Your Python version makes a very large difference for Stem. For instance, + with Python 2.7 reading a consensus takes **1,393.10 ms** (almost twice as + long). + +* Metrics-lib and Stem can both read from compressed tarballs at a small + performance cost. For instance, Metrics-lib can read an `lzma compressed + <../faq.html#how-do-i-read-tar-xz-descriptor-archives>`_ consensus in + **255.76 ms** and Stem can do it in **913.12 ms**. + +So what does code with each of these look like? + +Stem Example +------------ + +* `Benchmark Script <../.../../_static/example/benchmark_stem.py>`_ + +.. literalinclude:: /_static/example/benchmark_server_descriptor_stem.py + :language: python + +Metrics-lib Example +------------------- + +* `Benchmark Script <../.../../_static/example/benchmark_metrics_lib.java>`_ + +.. literalinclude:: /_static/example/benchmark_server_descriptor_metrics_lib.java + :language: java + +Zoossh Example +-------------- + +* `Benchmark Script <../.../../_static/example/benchmark_zoossh.go>`_ +.. literalinclude:: /_static/example/benchmark_server_descriptor_zoossh.go + :language: go

1 0

[stem/master] Pattern used by the ss connection resolver didn't work on Gentoo
by atagar＠torproject.org 16 Jan '16

16 Jan '16

commit 5f47e1ff4d79d1395e1ebca996931af932d0d3d6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 16 14:11:22 2016 -0800 Pattern used by the ss connection resolver didn't work on Gentoo Nice catch by toralf! On Gentoo our ss connection resolver didn't work... https://trac.torproject.org/projects/tor/ticket/18079 Reason is a slight difference at the end of lines. On Ubuntu I just have values, but Gentoo labels what they are... Ubuntu: users:(("ssh",16694,3)) Gentoo: users:(("tor",pid=25056,fd=997)) Easy to fix. The resolver now accepts both. --- docs/change_log.rst | 1 + stem/util/connection.py | 2 +- test/unit/util/connection.py | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 798eb86..359156e 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -72,6 +72,7 @@ The following are only available within Stem's `git repository * **Utilities** * Added :func:`~stem.util.__init__.datetime_to_unix` + * Pattern used by our 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) * **Interpreter** diff --git a/stem/util/connection.py b/stem/util/connection.py index 7d1adb0..c780f2d 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -116,7 +116,7 @@ RESOLVER_FILTER = { Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}\s*$', # tcp ESTAB 0 0 192.168.0.20:44415 38.229.79.2:443 users:(("tor",15843,9)) - Resolver.SS: '^{protocol}\s+ESTAB\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+users:$\("{name}",{pid},[0-9]+$\)$', + Resolver.SS: '^{protocol}\s+ESTAB\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+users:$\("{name}",(?:pid=)?{pid},(?:fd=)?[0-9]+$\)$', # tor 3873 atagar 45u IPv4 40994 0t0 TCP 10.243.55.20:45724->194.154.227.109:9001 (ESTABLISHED) Resolver.LSOF: '^{name}\s+{pid}\s+.*\s+{protocol}\s+{local_address}:{local_port}->{remote_address}:{remote_port} $ESTABLISHED$$', diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index c63f97f..8f3820c 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -53,6 +53,16 @@ tcp ESTAB 0 0 127.0.0.1:22 127.0.0.1:56673 tcp ESTAB 0 0 192.168.0.1:44415 38.229.79.2:443 users:(("tor",15843,9)) """ +SS_GENTOO_OUTPUT = """\ +Netid State Recv-Q Send-Q Local Address:Port Peer Address:Port +tcp ESTAB 0 0 5.9.158.75:443 107.170.93.13:56159 users:(("tor",pid=25056,fd=997)) +tcp ESTAB 0 0 5.9.158.75:443 159.203.97.91:37802 users:(("tor",pid=25056,fd=77)) +tcp ESTAB 0 0 2a01:4f8:190:514a::2:443 2001:638:a000:4140::ffff:189:38556 users:(("tor",pid=25056,fd=3175)) +tcp ESTAB 0 0 ::ffff:5.9.158.75:5222 ::ffff:78.54.131.65:34950 users:(("beam",pid=1712,fd=29)) +tcp ESTAB 0 0 2a01:4f8:190:514a::2:443 2001:858:2:2:aabb:0:563b:1526:51428 users:(("tor",pid=25056,fd=3248)) +tcp ESTAB 0 0 ::ffff:5.9.158.75:5222 ::ffff:78.54.131.65:34882 users:(("beam",pid=1712,fd=26)) +""" + LSOF_OUTPUT = """\ COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME ubuntu-ge 2164 atagar 11u IPv4 13593 0t0 TCP 192.168.0.1:55395->21.89.91.78:80 (CLOSE_WAIT) @@ -231,6 +241,22 @@ class TestConnection(unittest.TestCase): self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.SS, process_pid = 1111) @patch('stem.util.system.call') + def test_get_connections_by_ss_on_gentoo(self, call_mock): + """ + Checks the get_connections function with the ss resolver results on a + hardened Gentoo system... + + https://trac.torproject.org/projects/tor/ticket/18079 + """ + + call_mock.return_value = SS_GENTOO_OUTPUT.split('\n') + expected = [ + Connection('5.9.158.75', 443, '107.170.93.13', 56159, 'tcp'), + Connection('5.9.158.75', 443, '159.203.97.91', 37802, 'tcp'), + ] + self.assertEqual(expected, stem.util.connection.get_connections(Resolver.SS, process_pid = 25056, process_name = 'tor')) + + @patch('stem.util.system.call') def test_get_connections_by_lsof(self, call_mock): """ Checks the get_connections function with the lsof resolver.

1 0

[stem/master] Basic IPv6 support in get_connections()
by atagar＠torproject.org 16 Jan '16

16 Jan '16

commit 48dcdb9434924d01915a7d2a937bbbe458369f48 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 16 15:10:56 2016 -0800 Basic IPv6 support in get_connections() Now that I have some IPv6 output courtesy of ticket 18079 I can add IPv6 support. This is presently pretty simple in that we merely include IPv6 addresses if they're present. Many connection resolvers probably need special arguments to include them in their output and we don't yet do that (but patches welcome!). --- docs/change_log.rst | 3 +- stem/util/connection.py | 62 ++++++++++++++++++++++++++---------------- test/unit/util/connection.py | 8 ++++++ 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 359156e..0640aef 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -72,7 +72,8 @@ The following are only available within Stem's `git repository * **Utilities** * Added :func:`~stem.util.__init__.datetime_to_unix` - * Pattern used by our 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) + * Basic IPv6 support in :func:`~stem.util.connection.get_connections` + * The 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) * **Interpreter** diff --git a/stem/util/connection.py b/stem/util/connection.py index c780f2d..0490f9c 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -110,25 +110,25 @@ RESOLVER_FILTER = { Resolver.PROC: '', # tcp 0 586 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843/tor - Resolver.NETSTAT: '^{protocol}\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}/{name}\s*$', + Resolver.NETSTAT: '^{protocol}\s+.*\s+{local}\s+{remote}\s+ESTABLISHED\s+{pid}/{name}\s*$', # tcp 586 192.168.0.1:44284 38.229.79.2:443 ESTABLISHED 15843 - Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED\s+{pid}\s*$', + Resolver.NETSTAT_WINDOWS: '^\s*{protocol}\s+{local}\s+{remote}\s+ESTABLISHED\s+{pid}\s*$', # tcp ESTAB 0 0 192.168.0.20:44415 38.229.79.2:443 users:(("tor",15843,9)) - Resolver.SS: '^{protocol}\s+ESTAB\s+.*\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+users:$\("{name}",(?:pid=)?{pid},(?:fd=)?[0-9]+$\)$', + Resolver.SS: '^{protocol}\s+ESTAB\s+.*\s+{local}\s+{remote}\s+users:$\("{name}",(?:pid=)?{pid},(?:fd=)?[0-9]+$\)$', # tor 3873 atagar 45u IPv4 40994 0t0 TCP 10.243.55.20:45724->194.154.227.109:9001 (ESTABLISHED) - Resolver.LSOF: '^{name}\s+{pid}\s+.*\s+{protocol}\s+{local_address}:{local_port}->{remote_address}:{remote_port} $ESTABLISHED$$', + Resolver.LSOF: '^{name}\s+{pid}\s+.*\s+{protocol}\s+{local}->{remote} $ESTABLISHED$$', # atagar tor 15843 tcp4 192.168.0.20:44092 68.169.35.102:443 ESTABLISHED - Resolver.SOCKSTAT: '^\S+\s+{name}\s+{pid}\s+{protocol}4\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}\s+ESTABLISHED$', + Resolver.SOCKSTAT: '^\S+\s+{name}\s+{pid}\s+{protocol}4\s+{local}\s+{remote}\s+ESTABLISHED$', # _tor tor 4397 12 tcp4 172.27.72.202:54011 127.0.0.1:9001 - Resolver.BSD_SOCKSTAT: '^\S+\s+{name}\s+{pid}\s+\S+\s+{protocol}4\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}$', + Resolver.BSD_SOCKSTAT: '^\S+\s+{name}\s+{pid}\s+\S+\s+{protocol}4\s+{local}\s+{remote}$', # 3561 tor 4 s - rw---n-- 2 0 TCP 10.0.0.2:9050 10.0.0.1:22370 - Resolver.BSD_PROCSTAT: '^\s*{pid}\s+{name}\s+.*\s+{protocol}\s+{local_address}:{local_port}\s+{remote_address}:{remote_port}$', + Resolver.BSD_PROCSTAT: '^\s*{pid}\s+{name}\s+.*\s+{protocol}\s+{local}\s+{remote}$', } @@ -147,10 +147,16 @@ class Connection(collections.namedtuple('Connection', ['local_address', 'local_p def get_connections(resolver, process_pid = None, process_name = None): """ Retrieves a list of the current connections for a given process. This - provides a list of :class:`~stem.util.connection.Connection`. + provides a list of :class:`~stem.util.connection.Connection`. Note that + addresses may be IPv4 *or* IPv6 depending on what the platform supports. .. versionadded:: 1.1.0 + .. versionchanged:: 1.5.0 + Basic IPv6 support. This is incomplete in that resolver commands we run + may not surface IPv6 connections. But when present this function now + includes them in our results. + :param Resolver resolver: method of connection resolution to use :param int process_pid: pid of the process to retrieve :param str process_name: name of the process to retrieve @@ -197,10 +203,8 @@ def get_connections(resolver, process_pid = None, process_name = None): resolver_regex_str = RESOLVER_FILTER[resolver].format( protocol = '(?P<protocol>\S+)', - local_address = '(?P<local_address>[0-9.]+)', - local_port = '(?P<local_port>[0-9]+)', - remote_address = '(?P<remote_address>[0-9.]+)', - remote_port = '(?P<remote_port>[0-9]+)', + local = '(?P<local>[0-9a-f.:]+)', + remote = '(?P<remote>[0-9a-f.:]+)', pid = process_pid if process_pid else '[0-9]*', name = process_name if process_name else '\S*', ) @@ -211,26 +215,36 @@ def get_connections(resolver, process_pid = None, process_name = None): connections = [] resolver_regex = re.compile(resolver_regex_str) + def _parse_address_str(addr_type, addr_str, line): + addr, port = addr_str.rsplit(':', 1) + + if not is_valid_ipv4_address(addr) and not is_valid_ipv6_address(addr): + _log('Invalid %s address (%s): %s' % (addr_type, addr, line)) + return None, None + elif not is_valid_port(port): + _log('Invalid %s port (%s): %s' % (addr_type, port, line)) + return None, None + else: + _log('Valid %s:%s: %s' % (addr, port, line)) + return addr, int(port) + for line in results: match = resolver_regex.match(line) if match: attr = match.groupdict() - local_addr = attr['local_address'] - local_port = int(attr['local_port']) - remote_addr = attr['remote_address'] - remote_port = int(attr['remote_port']) - protocol = attr['protocol'].lower() - if remote_addr == '0.0.0.0': - continue # procstat response for unestablished connections + local_addr, local_port = _parse_address_str('local', attr['local'], line) + remote_addr, remote_port = _parse_address_str('remote', attr['remote'], line) + + if not (local_addr and local_port and remote_addr and remote_port): + continue # missing or malformed field + + protocol = attr['protocol'].lower() - if not (is_valid_ipv4_address(local_addr) and is_valid_ipv4_address(remote_addr)): - _log('Invalid address (%s or %s): %s' % (local_addr, remote_addr, line)) - elif not (is_valid_port(local_port) and is_valid_port(remote_port)): - _log('Invalid port (%s or %s): %s' % (local_port, remote_port, line)) - elif protocol not in ('tcp', 'udp'): + if protocol not in ('tcp', 'udp'): _log('Unrecognized protocol (%s): %s' % (protocol, line)) + continue conn = Connection(local_addr, local_port, remote_addr, remote_port, protocol) connections.append(conn) diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 8f3820c..776182d 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -253,9 +253,17 @@ class TestConnection(unittest.TestCase): expected = [ Connection('5.9.158.75', 443, '107.170.93.13', 56159, 'tcp'), Connection('5.9.158.75', 443, '159.203.97.91', 37802, 'tcp'), + Connection('2a01:4f8:190:514a::2', 443, '2001:638:a000:4140::ffff:189', 38556, 'tcp'), + Connection('2a01:4f8:190:514a::2', 443, '2001:858:2:2:aabb:0:563b:1526', 51428, 'tcp'), ] self.assertEqual(expected, stem.util.connection.get_connections(Resolver.SS, process_pid = 25056, process_name = 'tor')) + # TODO: This example ss output has entries like "::ffff:5.9.158.75:5222". + # What is this? Looks like a IPv6 *and* IPv4 address mashed together. Our + # resolver understandably thinks this is invalid right now. + + self.assertRaises(IOError, stem.util.connection.get_connections, Resolver.SS, process_name = 'beam') + @patch('stem.util.system.call') def test_get_connections_by_lsof(self, call_mock): """

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 16 Jan '16

16 Jan '16

commit 3c14bb588d7151a5eae8bf40cd704103eebf5655 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 16 21:16:15 2016 +0000 Update translations for tails-perl5lib_completed --- pl.po | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pl.po b/pl.po index 61a19ca..15d80bf 100644 --- a/pl.po +++ b/pl.po @@ -3,22 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-28 11:56+0100\n" -"PO-Revision-Date: 2014-03-19 11:26+0000\n" -"Last-Translator: yodaa <aron.plotnikowski(a)cryptolab.net>\n" -"Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n" +"POT-Creation-Date: 2016-01-11 15:40+0100\n" +"PO-Revision-Date: 2016-01-16 21:05+0000\n" +"Last-Translator: Jakub Goldberg <zenji.yamada.nihon(a)gmail.com>\n" +"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pl\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../lib/Tails/RunningSystem.pm:139 +#: ../lib/Tails/RunningSystem.pm:159 +msgid "Error" +msgstr "Błąd" + +#: ../lib/Tails/RunningSystem.pm:161 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" msgstr "Nie można znaleźć urządzenia, z którego działa Tails. Może użyto opcji `toram'?" + +#: ../lib/Tails/RunningSystem.pm:192 +msgid "" +"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"option?" +msgstr "Nie można znaleźć dysku z którego działa Tails. Może użyto opcji `toram'?"

1 0