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

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

28 Jul '16

commit 3e0bd1347b0b3feb855d8dee4aa456784d61912f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 22:45:57 2016 +0000 Update translations for tails-persistence-setup_completed --- pt/pt.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 1540244..ec7e0a9 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -13,14 +13,15 @@ # Nizia Dantas <nizia.dantas(a)gmail.com>, 2014 # Andrew Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014 +# Sérgio Marques <smarquespt(a)gmail.com>, 2016 # sccosta <sonia.peres.costa(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-06-06 08:15+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-07-27 22:45+0000\n" +"Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "Configuração e Keyrings do GnuPG" +msgstr "Configuração e chaveiro GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" @@ -58,7 +59,7 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "Perfis Pidgin e keyrings OTR" +msgstr "Perfis Pidgin e chaveiro OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Icedove"

1 0

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

28 Jul '16

commit 0e05f5244e71e000648f4fece3f6b50e66559246 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 22:45:53 2016 +0000 Update translations for tails-persistence-setup --- pt/pt.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 1540244..ec7e0a9 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -13,14 +13,15 @@ # Nizia Dantas <nizia.dantas(a)gmail.com>, 2014 # Andrew Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014 +# Sérgio Marques <smarquespt(a)gmail.com>, 2016 # sccosta <sonia.peres.costa(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2016-06-06 08:15+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-07-27 22:45+0000\n" +"Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgstr "GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:60 msgid "GnuPG keyrings and configuration" -msgstr "Configuração e Keyrings do GnuPG" +msgstr "Configuração e chaveiro GnuPG" #: ../lib/Tails/Persistence/Configuration/Presets.pm:68 msgid "SSH Client" @@ -58,7 +59,7 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "Perfis Pidgin e keyrings OTR" +msgstr "Perfis Pidgin e chaveiro OTR" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Icedove"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 28 Jul '16

28 Jul '16

commit 647cb86cfc77ac2226f36ee8ed0d528caae6db12 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 22:45:47 2016 +0000 Update translations for liveusb-creator --- pt/pt.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt/pt.po b/pt/pt.po index 919fc4b..bc65983 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-07-20 22:12+0000\n" +"PO-Revision-Date: 2016-07-27 22:35+0000\n" "Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -385,7 +385,7 @@ msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." -msgstr "Este botão permite-lhe procurar uma versão da ISO do sistema Live, previamente descarregada. Se não selecionar uma versão a versão selecionada será descarregada." +msgstr "Este botão permite-lhe procurar uma versão da ISO do sistema Live, previamente descarregada. Se não selecionar uma versão, a versão selecionada será descarregada." #: ../liveusb/dialog.py:171 msgid "" @@ -608,7 +608,7 @@ msgstr "Está a utilizar uma versão antiga do syslinux-extlinux que não suport #: ../liveusb/gui.py:783 msgid "You can try again to resume your download" -msgstr "Pode tentar de novo para retomar a sua transferência" +msgstr "Pode tentar retomar a sua descarga" #: ../liveusb/creator.py:95 msgid "You must run this application as root"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 28 Jul '16

28 Jul '16

commit f538830b6e06314ad3a4d19003574c3dfa357876 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 22:45:16 2016 +0000 Update translations for bridgedb_completed --- pt/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index fa7d72d..48bcebf 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -8,21 +8,21 @@ # André Monteiro <andre.monteir(a)gmail.com>, 2014 # Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>, 2015 # kagazz <lourenxo_619(a)hotmail.com>, 2014 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 # alfalb_mansil, 2014 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 # Andrew Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014-2015 -# Sérgio Marques <smarquespt(a)gmail.com>, 2014 +# Sérgio Marques <smarquespt(a)gmail.com>, 2014,2016 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>\n" +"PO-Revision-Date: 2016-07-27 22:39+0000\n" +"Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,7 +112,7 @@ msgstr "Passo %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Transferir o %s Navegador Tor %s" +msgstr "Descarregar o %s navegador Tor %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -132,7 +132,7 @@ msgstr "Passo %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Agora, %s adicione as pontes ao Navegador Tor %s" +msgstr "Agora, %s adicione as pontes ao navegador Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -184,7 +184,7 @@ msgstr "Aqui estão as suas pontes:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Você excedeu a taxa limite. Por favor, abrande! O tempo mínimo entre e-mails é de %s horas. Todas os e-mails seguintes durante este período serão ignoradas." +msgstr "Você excedeu a taxa limite. Por favor, abrande! O tempo mínimo entre e-mails é de %s horas. Todos os e-mails seguintes durante este período serão ignorados." #: bridgedb/strings.py:50 msgid "" @@ -341,7 +341,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Para inserir as ligações no Navegador Tor, vá primeiro a %s - transferir navegado Tor\npágina %s e depois siga as instruções para transferir e iniciar o \nNavegador Tor." +msgstr "Para inserir as ligações no navegador Tor, aceda à %s - página para descarregar o Tor %s\ne siga as instruções sobre com descarregar e utilizar o navegador Tor." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 28 Jul '16

28 Jul '16

commit 056476b81df2b7a3b1ff414c962db39c44d3aa11 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 22:45:06 2016 +0000 Update translations for bridgedb --- pt/LC_MESSAGES/bridgedb.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index fa7d72d..48bcebf 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -8,21 +8,21 @@ # André Monteiro <andre.monteir(a)gmail.com>, 2014 # Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>, 2015 # kagazz <lourenxo_619(a)hotmail.com>, 2014 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 # alfalb_mansil, 2014 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 -# Manuela Silva <h_manuela_rodsilva(a)gmail.com>, 2015 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 +# Manuela Silva <inactive+h_manuela_rodsilva(a)transifex.com>, 2015 # Andrew Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014-2015 -# Sérgio Marques <smarquespt(a)gmail.com>, 2014 +# Sérgio Marques <smarquespt(a)gmail.com>, 2014,2016 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues(a)litux.org>\n" +"PO-Revision-Date: 2016-07-27 22:39+0000\n" +"Last-Translator: Sérgio Marques <smarquespt(a)gmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,7 +112,7 @@ msgstr "Passo %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Transferir o %s Navegador Tor %s" +msgstr "Descarregar o %s navegador Tor %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -132,7 +132,7 @@ msgstr "Passo %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Agora, %s adicione as pontes ao Navegador Tor %s" +msgstr "Agora, %s adicione as pontes ao navegador Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -184,7 +184,7 @@ msgstr "Aqui estão as suas pontes:" msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "Você excedeu a taxa limite. Por favor, abrande! O tempo mínimo entre e-mails é de %s horas. Todas os e-mails seguintes durante este período serão ignoradas." +msgstr "Você excedeu a taxa limite. Por favor, abrande! O tempo mínimo entre e-mails é de %s horas. Todos os e-mails seguintes durante este período serão ignorados." #: bridgedb/strings.py:50 msgid "" @@ -341,7 +341,7 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Para inserir as ligações no Navegador Tor, vá primeiro a %s - transferir navegado Tor\npágina %s e depois siga as instruções para transferir e iniciar o \nNavegador Tor." +msgstr "Para inserir as ligações no navegador Tor, aceda à %s - página para descarregar o Tor %s\ne siga as instruções sobre com descarregar e utilizar o navegador Tor." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit 20d95d7ca932b53188b07f161d82e364e0a017a2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 13:15:05 2016 +0000 Update translations for bridgedb --- la/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/la/LC_MESSAGES/bridgedb.po b/la/LC_MESSAGES/bridgedb.po index 4c8f72c..b404342 100644 --- a/la/LC_MESSAGES/bridgedb.po +++ b/la/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-27 12:39+0000\n" +"PO-Revision-Date: 2016-07-27 13:04+0000\n" "Last-Translator: Alisa P <parashchenko.alisa(a)yandex.com>\n" "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n" "MIME-Version: 1.0\n" @@ -70,7 +70,7 @@ msgstr "QRCode pro lineis pontis tuis" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "False est!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." @@ -211,7 +211,7 @@ msgstr "Claves publicae" msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" "for %s on %s at %s." -msgstr "Ea littera in linea arcibus et unicornibus et lucibus\npro %s tempore %s %s." +msgstr "Eae litterae in linea arcibus et unicornibus et lucibus facti sunt\npro %s tempore %s %s." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". @@ -247,7 +247,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "" +msgstr "Additione BridgeDB multi pontes simplices habet %s\nsine \"Pluggable thansports %s, quid fortasse non tam grave sonat, sed adhuc\ncircumventionem censurae coniunctionis computatorum adesse possunt.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -256,11 +256,11 @@ msgstr "Quid sunt pontes?" #: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "" +msgstr "%s Pontes %s sunt Tor transmittores, quae tibi censuram circumvenire adsunt." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "" +msgstr "Modum alium acquistionis pontum egeo!" #: bridgedb/strings.py:108 #, python-format @@ -268,7 +268,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "" +msgstr "Modus alius acquistionis pontum missio litterarum in linea ad %s est.\nLitteras in linea sententia loci de uno eius processoribus litterarum in linea esse debet:\n%s aut %s aut %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 27 Jul '16

27 Jul '16

commit b9ccc2eb975d2aa1166badb806623a773eee0b77 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 27 12:45:04 2016 +0000 Update translations for bridgedb --- la/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/la/LC_MESSAGES/bridgedb.po b/la/LC_MESSAGES/bridgedb.po index 17b3b49..4c8f72c 100644 --- a/la/LC_MESSAGES/bridgedb.po +++ b/la/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-26 18:42+0000\n" +"PO-Revision-Date: 2016-07-27 12:39+0000\n" "Last-Translator: Alisa P <parashchenko.alisa(a)yandex.com>\n" "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n" "MIME-Version: 1.0\n" @@ -233,7 +233,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "" +msgstr "Nonnulli pontes sententiis loci IPv6 etiam existunt, quamquam non omna \"Pluggable Transports\"\n cum IPv6 esse possunt.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,

1 0

[metrics-web/master] Add link pages to two of phw's image galleries.
by karsten＠torproject.org 27 Jul '16

27 Jul '16

commit 2421d9164476893a65f0703a0326389964d9ff94 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 13 16:09:44 2016 +0200 Add link pages to two of phw's image galleries. Implements the first phase of #19183. --- website/etc/metrics.json | 28 ++++++++++++++++++++++++++++ website/etc/web.xml | 2 ++ website/web/images/networkchurn.png | Bin 0 -> 98625 bytes website/web/images/uptimes.jpg | Bin 0 -> 53484 bytes 4 files changed, 30 insertions(+) diff --git a/website/etc/metrics.json b/website/etc/metrics.json index ffa2ad2..c4b47a7 100644 --- a/website/etc/metrics.json +++ b/website/etc/metrics.json @@ -889,5 +889,33 @@ "related": [ "relayflags" ] + }, + { + "id": "uptimes", + "title": "Monthly uptime of relays", + "tags": [ + "Relays" + ], + "type": "Link", + "level": "Advanced", + "description": "The following image illustrates the uptime of all known <a href=\"about.html#relay\">relays</a> in a given month. Each row of pixels denotes one <a href=\"about.html#consensus\">consensus</a> (that is, one hour), and each column denotes one relay. Each pixel denotes if a given relay was online or offline at a given hour: black means online, white means offline, and red highlights relays with identical uptime patterns. The complete image gallery can be found on <a href=\"https://nymity.ch/sybilhunting/uptime-visualisation/\">Philipp Winter's homepage</a>.<a href=\"https://nymity.ch/sybilhunting/uptime-visualisation/\"><img src=\"images/uptimes.jpg\" alt=\"Monthly uptime of relays\"></a>", + "related": [ + "networkchurn" + ] + }, + { + "id": "networkchurn", + "title": "Network churn rate by relay flag", + "tags": [ + "Relays" + ], + "type": "Link", + "level": "Advanced", + "description": "The following image shows the churn rate of the Tor network by <a href=\"about.html#relay-flag\">relay flag</a> in a given month. The churn rate, a value in the interval [0,1], captures the rate of <a href=\"about.html#relay\">relays</a> joining and leaving the network from one <a href=\"about.html#consensus\">consensus</a> to the next (that is, within one hour). The complete image gallery can be found on <a href=\"https://nymity.ch/sybilhunting/churn-values/\">Philipp Winter's homepage</a>.<a href=\"https://nymity.ch/sybilhunting/churn-values/\"><img src=\"images/networkchurn.png\" alt=\"Network churn rate by relay flag\"></a>", + "related": [ + "uptimes", + "networksize", + "relayflags" + ] } ] diff --git a/website/etc/web.xml b/website/etc/web.xml index b1b6511..ebd9876 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -91,6 +91,8 @@ <servlet-name>Link</servlet-name> <url-pattern>/oxford-anonymous-internet.html</url-pattern> <url-pattern>/uncharted-data-flow.html</url-pattern> + <url-pattern>/uptimes.html</url-pattern> + <url-pattern>/networkchurn.html</url-pattern> </servlet-mapping> <servlet> diff --git a/website/web/images/networkchurn.png b/website/web/images/networkchurn.png new file mode 100644 index 0000000..027a8bf Binary files /dev/null and b/website/web/images/networkchurn.png differ diff --git a/website/web/images/uptimes.jpg b/website/web/images/uptimes.jpg new file mode 100644 index 0000000..1376437 Binary files /dev/null and b/website/web/images/uptimes.jpg differ

1 0

[onionoo/master] Removed Vagrant and added links to wiki guide docs.
by karsten＠torproject.org 27 Jul '16

27 Jul '16

commit d61c0ee7381789d0c71a9e5c3a3bbc5324026dbb Author: iwakeh <iwakeh(a)torproject.org> Date: Mon Jul 25 22:39:20 2016 +0200 Removed Vagrant and added links to wiki guide docs. --- CONTRIB.md | 90 ++-------------------------------------------------- Vagrantfile | 19 ----------- vagrant/bootstrap.sh | 30 ------------------ 3 files changed, 3 insertions(+), 136 deletions(-) diff --git a/CONTRIB.md b/CONTRIB.md index d971ec4..a432069 100644 --- a/CONTRIB.md +++ b/CONTRIB.md @@ -1,92 +1,8 @@ # Contributor Guide -This guide is meant for people who want to contribute patches to Onionoo. -It contains the following sections: - - - Patch format - - Whitespace conventions - - Vagrant-based development environment - - Documentation overview - - Versions - -## Patch format - -Format your patches using `git format-patch` if you want to submit just a -single, small commit. -If you want to submit more than one commit, push your changes to a public -Git repository somewhere that can be pulled from. - -## Whitespace conventions - -Whitespace conventions are important, because whitespace changes bloat -patches and make them harder to review. -If we all agree on the same whitespace conventions, the only changes to -review are actually meaningful changes. -If you need to make whitespace changes, because files did not conform to -whitespace conventions before, do these changes in one or more separate -commits that contain nothing else than whitespace changes. - -The following whitespace conventions apply: - - - Maximum line width is 74 characters. Why 74? Because it looks pretty -in vim in a 80-character terminal with line numbers turned on. - - Full sentences are followed by a period and two spaces. An exception -to this rule are sentences in markup files like Markdown; in this case, -each sentence should start with a newline, so that a change in one -sentence doesn't cause changes to all subsequent sentences. An exception -to this exception are multiple sentences in a single bullet point. - - Indentations use two spaces, no tabs. Continuations use four spaces. - - Attributes and methods are typically separated by two newlines. An -exception are attributes with getters and setters which can be written -without separating newlines. - - All source files end with two newlines. - -## Vagrant-based development environment - -Before using Vagrant, make sure that Onionoo builds correctly on the host -system. -This may require running `git submodule init && git submodule update`, as -well as providing all required libraries. - -The given Vagrant file uses Version 2, i.e., a Vagrant installation -of version 1.1 or above is necessary. -The following was tested using 1.4.3 and VirtualBox 4.3.14. -(Wheezy stable only provides 1.0.3, Jessie provides 1.4.3) - -Local changes to the Vagrantfile: -Tell Vagrant how much memory the virtual machine may use, i.e., change - -``` -vb.memory = 4096 -``` - -to some value that makes sense on your machine. -Rule of thumb: less than half the RAM, but as much as you want to spare. - -Create a Debian Wheezy 64 bit instance: - -``` -vagrant up -``` - -This command downloads the virtual machine imagine, unless it has been -downloaded before, creates a new virtual machine, and runs the bootstrap -script in `vagrant/bootstrap.sh`. This may take a few minutes. - -Once this is all done, log into the virtual machine and change to the -Onionoo working directory: - -``` -vagrant ssh -cd /srv/onionoo.torproject.org/onionoo/ -``` - -Important: better avoid runninng Ant in the `/vagrant/` directory (which -is shared with the host), or the guest system will write directly to the -host system, which performs not really well. - -Read the INSTALL file and make the appropriate changes to adapt everything -to your setup, e.g., memory settings. +Please refer to our Contributor and Java coding style documents +available in The Tor Project's wiki: +https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam/Documentation#guides ## Documentation overview diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index c30e452..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,19 +0,0 @@ -VAGRANTFILE_API_VERSION = "2" - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - - config.vm.box = "wheezy64" - config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.…" - - config.vm.boot_timeout = 60 - - config.vm.network "forwarded_port", guest: 8080, host: 8080 - - config.vm.provider "virtualbox" do |vb| - vb.memory = 4096 - end - - config.vm.provision :shell, :path => "vagrant/bootstrap.sh" - -end - diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh deleted file mode 100644 index 13138cc..0000000 --- a/vagrant/bootstrap.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -echo "Starting provisioning." - -echo "Updating package list and upgrading existing packages." -apt-get update -apt-get -y upgrade - -echo "Removing Java 6 packages." -apt-get purge -y openjdk-6-jdk default-jre - -echo "Installing required packages." -apt-get install -y openjdk-7-jdk -apt-get install -y libcommons-codec-java libcommons-compress-java \ -libcommons-lang3-java libgoogle-gson-java junit4 libservlet3.0-java \ -ant libslf4j-java liblogback-java unzip libjetty8-java - -echo "Setting up paths and creating symbolic links." -mkdir -p /srv/onionoo.torproject.org/onionoo/ -cd /srv/onionoo.torproject.org/onionoo/ -ln -s /vagrant/build.xml -ln -s /vagrant/deps -ln -s /vagrant/etc -ln -s /vagrant/geoip -ln -s /vagrant/src -ln -s /vagrant/web -chown -R vagrant:vagrant /srv/onionoo.torproject.org/ - -echo "Done provisioning." -

1 0

[chutney/master] Configure a ControlPort for every tor instance run by chutney
by teor＠torproject.org 27 Jul '16

27 Jul '16

commit a68c4538f2bd584be9a838ac365433cabfc2b5e8 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Jul 27 16:30:43 2016 +1000 Configure a ControlPort for every tor instance run by chutney (Not just for clients.) Implements feature #19765. --- torrc_templates/client.tmpl | 1 - torrc_templates/common.i | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/torrc_templates/client.tmpl b/torrc_templates/client.tmpl index b7b6859..e0fbad9 100644 --- a/torrc_templates/client.tmpl +++ b/torrc_templates/client.tmpl @@ -1,6 +1,5 @@ ${include:common.i} SocksPort $socksport -ControlPort $controlport CookieAuthentication 1 #NOTE: Setting TestingClientConsensusDownloadSchedule doesn't diff --git a/torrc_templates/common.i b/torrc_templates/common.i index e244565..2776ca1 100644 --- a/torrc_templates/common.i +++ b/torrc_templates/common.i @@ -46,3 +46,5 @@ ProtocolWarnings 1 SafeLogging 0 DisableDebuggerAttachment 0 ${authorities} + +ControlPort $controlport

1 0