June 2015 - tor-commits - lists.torproject.org

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 09 Jun '15

09 Jun '15

commit 2d88d317111b32394ce342d76c26a385de780f5e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 9 18:15:31 2015 +0000 Update translations for whisperback --- fil/fil.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fil/fil.po b/fil/fil.po index dc22926..f335202 100644 --- a/fil/fil.po +++ b/fil/fil.po @@ -4,13 +4,14 @@ # # Translators: # Kay P., 2014-2015 +# Noelle Velasquez <noelle_velasquez(a)yahoo.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-17 17:40+0100\n" -"PO-Revision-Date: 2015-02-10 09:31+0000\n" -"Last-Translator: Kay P.\n" +"PO-Revision-Date: 2015-06-09 05:42+0000\n" +"Last-Translator: Noelle Velasquez <noelle_velasquez(a)yahoo.com>\n" "Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +39,7 @@ msgstr "Maling contact sa OpenPGP public key block" msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" -msgstr "" +msgstr "Hindi nakita ang %s variable sa mga configuration files na /etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py" #: ../whisperBack/gui.py:154 msgid "Unable to load a valid configuration." @@ -80,7 +81,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "" +msgstr "\n\nHindi maipadala ang bug report dahil sa mga problema sa network. Subukin mag-reconnect sa network at i-click ang ipadala muli. \n\nKung hindi ito gumana, bibigyan ka ng opsyon upang i-save ang bug report." #: ../whisperBack/gui.py:274 msgid "Your message has been sent."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 09 Jun '15

09 Jun '15

commit 65f7310cd52f6adfd2af3b89cedc2ccfbdc046e6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 9 18:15:14 2015 +0000 Update translations for bridgedb_completed --- pt/LC_MESSAGES/bridgedb.po | 75 ++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index 48229a7..85c7093 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -7,17 +7,17 @@ # André Monteiro <andre.monteir(a)gmail.com>, 2014 # kagazz <lourenxo_619(a)hotmail.com>, 2014 # alfalb_mansil, 2014 -# Andrew_Melim <nokostya.translation(a)gmail.com>, 2014 +# MMSRS, 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 # 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-02-03 03:24+0000\n" -"PO-Revision-Date: 2015-02-23 16:31+0000\n" -"Last-Translator: alfalb.as\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" +"PO-Revision-Date: 2015-06-05 12:18+0000\n" +"Last-Translator: MMSRS\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -37,7 +37,7 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:122 +#: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." msgstr "Desculpe! Ocorreu algo de errado com o seu pedido." @@ -47,7 +47,7 @@ msgstr "[Esta é uma mensagem automática; por favor, não responda.]" #: lib/bridgedb/strings.py:20 msgid "Here are your bridges:" -msgstr "Aqui estão as suas pontes:" +msgstr "Aqui estão as suas ligações:" #: lib/bridgedb/strings.py:22 #, python-format @@ -106,7 +106,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "A BridgeDB pode fornecer pontes com vários %stypes de Pluggable Transports%s,\nque poderão ajudar a ocultar as suas ligações à Tor Network, tornando mais difícil\na filtragem do seu tráfego de Internet para determinar se está a usar o Tor.\n" +msgstr "A BridgeDB pode proporcionar ligações com vários %stypes de Pluggable Transports%s,\nque podem ajudar a ocultar as suas conexões à Rede Tor, tornando mais difícil\no rastreamento do seu tráfego na Internet para determinar se está a utilizar o Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: lib/bridgedb/strings.py:54 @@ -114,7 +114,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Também estão disponíveis algumas pontes com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com ligações IPv6.\n\n" +msgstr "Também estão disponíveis algumas ligações com endereços IPv6. \nNo entanto, alguns Pluggable Transports não são compatíveis com o IPv6.\n\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -128,20 +128,20 @@ 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 "Adicionalmente, a BridgeDB tem imensas pontes %s simples, normais e regulares\nmas sem qualquer Pluggable Transports %s, o que pode não parecer aliciante, mas\nque, ainda assim, ajudam a contornar a censura na Internet.\n" +msgstr "Adicionalmente, BridgeDB tem imensas ligações %s simples, normais e regulares\nmas sem quaisquer Pluggable Transports %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n" #: lib/bridgedb/strings.py:76 msgid "What are bridges?" -msgstr "O que são pontes?" +msgstr "O que são ligações?" #: lib/bridgedb/strings.py:77 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." -msgstr "%s Pontes %s são relays Tor para ajudar a contornar a censura." +msgstr "%s Ligações %s são retransmissões Tor que o ajudam a contornar a censura." #: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" -msgstr "Preciso de uma alternativa para obter pontes!" +msgstr "Eu preciso de uma alternativa para obter ligações!" #: lib/bridgedb/strings.py:83 #, python-format @@ -149,11 +149,11 @@ 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 "Outra forma de obter pontes é enviar uma mensagem para %s. Por favor, note que\na mensagem tem de ser enviada de um dos seguintes fornecedores de serviço:\n%s, %s ou %s." +msgstr "Outra forma de obter ligações, é enviar uma mensagem para %s. Por favor, note que\ndeverá enviar a mensagem utilizando um endereço dos seguintes fornecedores de correio eletrónico:\n%s, %s ou %s." #: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" -msgstr "As minhas pontes não funcionam! Eu preciso de ajuda!" +msgstr "As minhas ligações não funcionam! Eu preciso de ajuda!" #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:92 @@ -169,7 +169,7 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Tente incluir o máximo de informação sobre os problemas. Deve incluir a lista\nde pontes e Pluggable Transports que tentou utilizar, a sua versão Tor e \nquaisquer mensagens que o Tor retornou..." +msgstr "Tente incluir o máximo de informação possível sobre o seu caso, incluindo a lista\nde ligações e Pluggable Transports que tentou utilizar, a versão do seu Tor e \nquaisquer mensagens que o Tor devolveu, etc." #: lib/bridgedb/strings.py:103 msgid "Here are your bridge lines:" @@ -177,7 +177,7 @@ msgstr "Aqui estão as suas linhas de ponte:" #: lib/bridgedb/strings.py:104 msgid "Get Bridges!" -msgstr "Obter pontes!" +msgstr "Obter Ligações!" #: lib/bridgedb/strings.py:108 msgid "Please select options for bridge type:" @@ -202,62 +202,63 @@ msgstr "Introduza os caracteres da imagem acima..." #: lib/bridgedb/strings.py:119 msgid "How to start using your bridges" -msgstr "Como utilizar as suas pontes" +msgstr "Como utilizar as suas ligações" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: lib/bridgedb/strings.py:121 #, python-format msgid "" -"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" -"Browser download page %s to start Tor Browser." -msgstr "Para inserir pontes no Tor Browser, siga as instruções na página de transferências\n%s do Tor Browser %s para iniciar o Tor Browser." +"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." #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:125 +#: lib/bridgedb/strings.py:126 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Assim que o diálogo de rede Tor aparecer, clique em Configurar e siga\nas intruções do assistente até que lhe pergunte:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:129 +#: lib/bridgedb/strings.py:130 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "O seu fornecedor de serviço Internet (ISP) bloqueia ou censura as ligações\n à rede Tor?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:133 +#: lib/bridgedb/strings.py:134 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecione Sim e clique Seguinte. Para configurar as novas pontes, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em \"Ligar\" e\ndeve estar pronto! Se ocorrerem erros, clique no botão de Ajuda no\nassistente de Definições da rede Tor." +msgstr "Selecione 'Sim' e clique em 'Seguinte'. Para configurar as suas novas ligações, copie e\ncole as linhas da ligação na caixa de texto. Finalmente, clique em 'Conetar' e\ndeverá estar pronto para continuar! Se ocorrerem erros, clique em 'Ajuda' no\nassistente de 'Configurações da Rede Tor' para mais assistência." -#: lib/bridgedb/strings.py:141 +#: lib/bridgedb/strings.py:142 msgid "Displays this message." msgstr "Mostra esta mensagem." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:145 +#: lib/bridgedb/strings.py:146 msgid "Request vanilla bridges." -msgstr "Solicita as pontes básicas." +msgstr "Solicita as ligações básicas." -#: lib/bridgedb/strings.py:146 +#: lib/bridgedb/strings.py:147 msgid "Request IPv6 bridges." -msgstr "Solicita pontes IPv6." +msgstr "Solicita ligações IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:148 +#: lib/bridgedb/strings.py:149 msgid "Request a Pluggable Transport by TYPE." msgstr "Solicita um Pluggable Transport por TYPE." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:151 +#: lib/bridgedb/strings.py:152 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Obter uma cópia da chave pública GnuPG da BridgeDB." @@ -310,7 +311,7 @@ msgstr "Este QRCode contém as suas linhas de ponte. Leia-o com um leitor de QRC #: lib/bridgedb/templates/bridges.html:181 msgid "There currently aren't any bridges available..." -msgstr "Atualmente não existem pontes livres..." +msgstr "Atualmente, não existem ligações disponíveis..." #: lib/bridgedb/templates/bridges.html:182 #, python-format @@ -337,7 +338,7 @@ msgstr "Passo %s2%s" #: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Obtenha %s pontes %s" +msgstr "Obtenha %s ligações %s" #: lib/bridgedb/templates/index.html:36 #, python-format @@ -347,7 +348,7 @@ msgstr "Passo %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Agora %s adiciona as pontes ao navegador Tor %s" +msgstr "Agora %s adiciona as ligações 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! @@ -356,7 +357,7 @@ msgstr "Agora %s adiciona as pontes ao navegador Tor %s" #: lib/bridgedb/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sA%spenas quero as pontes!" +msgstr "Dê-me %sa%spenas as ligações!" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" @@ -384,4 +385,4 @@ msgstr "%sS%sim!" #: lib/bridgedb/templates/options.html:151 #, python-format msgid "%sG%set Bridges" -msgstr "%sO%sbter pontes" +msgstr "%sO%sbter Ligações"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 09 Jun '15

09 Jun '15

commit bbdf545f54dc70c012aa0f42332bd4c3f89cab79 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 9 18:15:06 2015 +0000 Update translations for bridgedb --- af/LC_MESSAGES/bridgedb.po | 7 ++++--- pt/LC_MESSAGES/bridgedb.po | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po index 478a1dd..b393cd3 100644 --- a/af/LC_MESSAGES/bridgedb.po +++ b/af/LC_MESSAGES/bridgedb.po @@ -3,12 +3,13 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Douglas van Wyngaard <cisticolamedia(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-06-05 16:55+0000\n" +"Last-Translator: Douglas van Wyngaard <cisticolamedia(a)gmail.com>\n" "Language-Team: Afrikaans (http://www.transifex.com/projects/p/torproject/language/af/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,7 +31,7 @@ msgstr "" #. "Tor Browser" #: lib/bridgedb/HTTPServer.py:107 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "Jammer! Iets het verkeerd geloop met jou versoek." #: lib/bridgedb/strings.py:18 msgid "[This is an automated message; please do not reply.]" diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po index f00702c..85c7093 100644 --- a/pt/LC_MESSAGES/bridgedb.po +++ b/pt/LC_MESSAGES/bridgedb.po @@ -8,7 +8,7 @@ # kagazz <lourenxo_619(a)hotmail.com>, 2014 # alfalb_mansil, 2014 # MMSRS, 2015 -# Andrew_Melim <nokostya.translation(a)gmail.com>, 2014 +# Andrew Melim <nokostya.translation(a)gmail.com>, 2014 # Pedro Albuquerque <palbuquerque73(a)gmail.com>, 2014-2015 # Sérgio Marques <smarquespt(a)gmail.com>, 2014 # TiagoJMMC <tiagojmmc(a)gmail.com>, 2014 @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-05-22 17:21+0000\n" +"PO-Revision-Date: 2015-06-05 12:18+0000\n" "Last-Translator: MMSRS\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" @@ -211,7 +211,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 "" +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." #. TRANSLATORS: Please DO NOT translate "Tor". #: lib/bridgedb/strings.py:126

1 0

[nyx/master] Use distutil's mkpath()
by atagar＠torproject.org 09 Jun '15

09 Jun '15

commit f5e83f8b12b31f7159bae06b74c7cbecd3956983 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 9 08:23:45 2015 -0700 Use distutil's mkpath() The distutils Command class we're extending already has a mkpath() helper. Might as well use it rather than reinvent the wheel. --- setup.py | 58 +++++++++++++++++++++++----------------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/setup.py b/setup.py index a54ff89..e0cd84f 100644 --- a/setup.py +++ b/setup.py @@ -17,38 +17,6 @@ DEFAULT_MAN_PAGE_PATH = '/usr/share/man/man1/nyx.1.gz' DEFAULT_SAMPLE_PATH = '/usr/share/doc/nyx/nyxrc.sample' -def mkdir_for(path): - path_dir = os.path.dirname(path) - - if not os.path.exists(path_dir): - try: - os.makedirs(path_dir) - except OSError as exc: - raise OSError(None, "unable to make directory %s (%s)" % (path_dir, exc.strerror.lower())) - - -def install_man_page(source, dest): - if not os.path.exists(source): - raise OSError(None, "man page doesn't exist at '%s'" % source) - - mkdir_for(dest) - open_func = gzip.open if dest.endswith('.gz') else open - - with open(source, 'rb') as source_file: - with open_func(dest, 'wb') as dest_file: - dest_file.write(source_file.read()) - log.info("installed man page to '%s'" % dest) - - -def install_sample(source, dest): - if not os.path.exists(source): - raise OSError(None, "nyxrc sample doesn't exist at '%s'" % source) - - mkdir_for(dest) - shutil.copyfile(source, dest) - log.info("installed sample nyxrc to '%s'" % dest) - - class NyxInstaller(install): """ Nyx installer. This adds the following additional options... @@ -82,17 +50,37 @@ class NyxInstaller(install): # than 'run_nyx'. bin_dest = os.path.join(self.install_scripts, 'nyx') - mkdir_for(bin_dest) + self.mkpath(self.install_scripts) shutil.copyfile('run_nyx', bin_dest) mode = ((os.stat(bin_dest)[stat.ST_MODE]) | 0o555) & 0o7777 os.chmod(bin_dest, mode) log.info("installed bin script to '%s'" % bin_dest) if self.man_page: - install_man_page(os.path.join('nyx', 'resources', 'nyx.1'), self.man_page) + self.install_man_page(os.path.join('nyx', 'resources', 'nyx.1'), self.man_page) if self.sample_path: - install_sample('nyxrc.sample', self.sample_path) + self.install_sample('nyxrc.sample', self.sample_path) + + def install_man_page(self, source, dest): + if not os.path.exists(source): + raise OSError(None, "man page doesn't exist at '%s'" % source) + + self.mkpath(os.path.dirname(dest)) + open_func = gzip.open if dest.endswith('.gz') else open + + with open(source, 'rb') as source_file: + with open_func(dest, 'wb') as dest_file: + dest_file.write(source_file.read()) + log.info("installed man page to '%s'" % dest) + + def install_sample(self, source, dest): + if not os.path.exists(source): + raise OSError(None, "nyxrc sample doesn't exist at '%s'" % source) + + self.mkpath(os.path.dirname(dest)) + shutil.copyfile(source, dest) + log.info("installed sample nyxrc to '%s'" % dest) # installation requires us to be in our setup.py's directory

1 0

[nyx/master] Move nyx bin script creation to a install_bin_script() helper
by atagar＠torproject.org 09 Jun '15

09 Jun '15

commit 565b9c42af0d80a1b678b7b10e856e0a68558564 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 9 08:27:23 2015 -0700 Move nyx bin script creation to a install_bin_script() helper Lets keep our run() method trivial. The script installation is becoming complicated enough to warrant a helper anyway. --- setup.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/setup.py b/setup.py index e0cd84f..b07995f 100644 --- a/setup.py +++ b/setup.py @@ -45,16 +45,7 @@ class NyxInstaller(install): def run(self): install.run(self) - # Install our bin script. We do this ourselves rather than with the setup() - # method's scripts argument because we want to call the script 'nyx' rather - # than 'run_nyx'. - - bin_dest = os.path.join(self.install_scripts, 'nyx') - self.mkpath(self.install_scripts) - shutil.copyfile('run_nyx', bin_dest) - mode = ((os.stat(bin_dest)[stat.ST_MODE]) | 0o555) & 0o7777 - os.chmod(bin_dest, mode) - log.info("installed bin script to '%s'" % bin_dest) + self.install_bin_script('run_nyx', os.path.join(self.install_scripts, 'nyx')) if self.man_page: self.install_man_page(os.path.join('nyx', 'resources', 'nyx.1'), self.man_page) @@ -62,6 +53,17 @@ class NyxInstaller(install): if self.sample_path: self.install_sample('nyxrc.sample', self.sample_path) + def install_bin_script(self, source, dest): + # Install our bin script. We do this ourselves rather than with the setup() + # method's scripts argument because we want to call the script 'nyx' rather + # than 'run_nyx'. + + self.mkpath(os.path.dirname(dest)) + shutil.copyfile(source, dest) + mode = ((os.stat(dest)[stat.ST_MODE]) | 0o555) & 0o7777 + os.chmod(dest, mode) + log.info("installed bin script to '%s'" % dest) + def install_man_page(self, source, dest): if not os.path.exists(source): raise OSError(None, "man page doesn't exist at '%s'" % source)

1 0

[nyx/master] Don't install a man page or sample script by default
by atagar＠torproject.org 09 Jun '15

09 Jun '15

commit 67e013d14c66b026361f434dd8344917e7c24d40 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 9 09:40:18 2015 -0700 Don't install a man page or sample script by default We added '--man-page' and '--sample-path' arguments to our setup.py. It's a bit more intuitive if we don't install these resources unless the user opts-in since they don't respect --prefix, --user, and other such arguments... https://trac.torproject.org/projects/tor/ticket/16317 --- setup.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index d780228..103b674 100644 --- a/setup.py +++ b/setup.py @@ -14,9 +14,6 @@ from distutils import log from distutils.core import setup from distutils.command.install import install -DEFAULT_MAN_PAGE_PATH = '/usr/share/man/man1/nyx.1.gz' -DEFAULT_SAMPLE_PATH = '/usr/share/doc/nyx/nyxrc.sample' - class NyxInstaller(install): """ @@ -34,14 +31,14 @@ class NyxInstaller(install): """ user_options = install.user_options + [ - ('man-page=', None, 'man page location (default: %s)' % DEFAULT_MAN_PAGE_PATH), - ('sample-path=', None, 'example nyxrc location (default: %s)' % DEFAULT_SAMPLE_PATH), + ('man-page=', None, 'man page location'), + ('sample-path=', None, 'example nyxrc location'), ] def initialize_options(self): install.initialize_options(self) - self.man_page = DEFAULT_MAN_PAGE_PATH - self.sample_path = DEFAULT_SAMPLE_PATH + self.man_page = None + self.sample_path = None def run(self): install.run(self)

1 0

[nyx/master] Adjust shebang line of installed nyx script
by atagar＠torproject.org 09 Jun '15

09 Jun '15

commit 8e050ea63ac3e7a69422352c78568d64d55cc517 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jun 9 09:35:08 2015 -0700 Adjust shebang line of installed nyx script Very good point from Yawning that we should adjust our shebang line to match the interpreter that's installing us... https://trac.torproject.org/projects/tor/ticket/16317 This is based on the copy_scripts() method of... distutils/command/build_scripts.py --- setup.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b07995f..d780228 100644 --- a/setup.py +++ b/setup.py @@ -6,6 +6,7 @@ import gzip import os import shutil import stat +import sysconfig import nyx @@ -57,9 +58,22 @@ class NyxInstaller(install): # Install our bin script. We do this ourselves rather than with the setup() # method's scripts argument because we want to call the script 'nyx' rather # than 'run_nyx'. + # + # If using setuptools this would be better replaced with its entry_points. self.mkpath(os.path.dirname(dest)) - shutil.copyfile(source, dest) + + with open(source, 'rb') as source_file: + with open(dest, 'wb') as dest_file: + orig_shebang = source_file.readline() + + python_cmd = 'python%s%s' % (sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('EXE')) + new_shebang = '#!%s\n' % os.path.join(sysconfig.get_config_var('BINDIR'), python_cmd) + + log.info("adjusting bin script's shebang line '%s' -> '%s'" % (orig_shebang.strip(), new_shebang.strip())) + dest_file.write(new_shebang) + dest_file.write(source_file.read()) + mode = ((os.stat(dest)[stat.ST_MODE]) | 0o555) & 0o7777 os.chmod(dest, mode) log.info("installed bin script to '%s'" % dest)

1 0

[torspec/master] actually add proposal 245
by nickm＠torproject.org 08 Jun '15

08 Jun '15

commit 3605bcf15635a9a5a7f034887944091514f70ee8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 8 11:21:57 2015 -0400 actually add proposal 245 --- proposals/245-tap-out.txt | 96 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/proposals/245-tap-out.txt b/proposals/245-tap-out.txt new file mode 100644 index 0000000..27d73ab --- /dev/null +++ b/proposals/245-tap-out.txt @@ -0,0 +1,96 @@ +Filename: 245-tap-out.txt +Title: Deprecating and removing the TAP circuit extension protocol +Author: Nick Mathewson +Created: 2015-06-02 +Status: Draft + +0. Introduction + + This proposal describes a series of steps necessary for deprecating + TAP without breaking functionality. + + TAP is the original protocol for one-way authenticated key negotiation + used by Tor. Before Tor version 0.2.4, it was the only supported + protocol. Its key length is unpleasantly short, however, and it had + some design warts. Moreover, it had no name, until Ian Goldberg wrote + a paper about the design warts. + + Why deprecate and remove it? Because ntor is better in basically + every way. It's actually got a proper security proof, the key + strength seems to be 20th-century secure, and so on. Meanwhile, TAP + is lingering as a zombie, taking up space in descriptors and + microdescriptors. + +1. TAP is still in (limited) use today for hidden service hops. + + The original hidden service protocol only describes a way to tell + clients and servers about an introduction point's or a rendezvous + point's TAP onion key. + + We can do a bit better (see section 4), but we can't break TAP + completely until current clients and hidden services are obsolete. + +2. The step-by-step process. + + Step 1. Adjust the parsing algorithm for descriptors and microdescriptors + on servers so that it accepts MDs without a TAP key. See section 3 below. + Target: 0.2.7. + + Step 1b. Optionally, when connecting to a known IP/RP, extend by ntor. + (See section 4 below.) + + Step 2. Wait until proposal 224 is implemented. (Clients and hidden + services implementing 224 won't need TAP for anything.) + + Step 3. Begin throttling TAP answers even more aggressively at relays. + Target: prop224 is stable. + + Step 4. Wait until all versions of Tor without prop224 support are + obsolete/deprecated. + + Step 5. Stop generating TAP keys; stop answering TAP requests; stop + advertising TAP keys in descriptors; stop including them in + microdescriptors. + Target: prop224 has been stable for 12-18 months, and 0.2.7 has been stable + for 2-3 years. + + +3. Accepting descriptors without TAP keys. (Step 1) + + Our microdescriptor parsing code uses the string "onion-key" at the + start of the line to identify the boundary between microdescriptors, + so we can't remove it entirely. Instead, we will make the body + optional. + + We will make the following changes to dir-spec: + + - In router descriptors, make the onion-key field "at most once" + instead of "exactly once." + + - In microdescriptors, make the body of "onion-key" optional. + + Until Step 4, authorities MUST still reject any descriptor without a + TAP key. + + If we do step 1 before proposal 224 is implemented, we'll need to make + sure that we never choose a relay without a TAP key as an introduction + point or a rendezvous point. + +4. Avoiding TAP earlier for HS usage (Step 1b) + + We could begin to move more circuits off TAP now by adjusting our + behavior for extending circuits to Introduction Points and Rendezvous + Points. The new rule would be: + + If you've been told to extend to an IP/RP, and you know a directory + entry for that relay (matching by identity), you extend using the + node_t you have instead. + + This would improve cryptographic security a bit, at the expense of + making it possible to probe for whether a given hidden service has an + up-to-date consensus or not, and learn whether each client has an + up-to-date consensus or not. We need to figure out whether that + enables an attack. + + (For reference, the functions to patch would be + rend_client_get_random_intro_impl and find_rp_for_intro.)

1 0

[tor/master] Edit contrib/README to document the contrib/clang directory
by nickm＠torproject.org 08 Jun '15

08 Jun '15

commit 7f3b15a8ec119f696f666dc2d98e25d71c69e19c Author: teor <teor2345(a)gmail.com> Date: Sat Jun 6 07:56:41 2015 +1000 Edit contrib/README to document the contrib/clang directory --- contrib/README | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contrib/README b/contrib/README index 07c6f77..3a94bb5 100644 --- a/contrib/README +++ b/contrib/README @@ -11,6 +11,13 @@ add-tor is an old script to manipulate the approved-routers file. nagios-check-tor-authority-cert is a nagios script to check when Tor authority certificates are expired or nearly expired. +clang/ -- Files for use with the clang compiler +----------------------------------------------- + +sanitize_blacklist.txt is used to build Tor with clang's dynamic +AddressSanitizer and UndefinedBehaviorSanitizer. It contains detailed +instructions on configuration, build, and testing with clang's sanitizers. + client-tools/ -- Tools for use with Tor clients -----------------------------------------------

1 0

[tor/master] Merge remote-tracking branch 'teor/feature15817-clang-sanitizers'
by nickm＠torproject.org 08 Jun '15

08 Jun '15

commit 64bdf040f021ca3ccb661c4056ee857e2ed44a4e Merge: c0c0a60 7f3b15a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 8 10:57:25 2015 -0400 Merge remote-tracking branch 'teor/feature15817-clang-sanitizers' changes/feature15817-clang-sanitizers | 7 +++ contrib/README | 7 +++ contrib/clang/sanitize_blacklist.txt | 89 +++++++++++++++++++++++++++++++++ doc/HACKING | 26 ++++++++++ 4 files changed, 129 insertions(+)

1 0