tor-commits November 2013

tor-commits@lists.torproject.org

17 participants
1171 discussions

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Nov '13

27 Nov '13

commit 9b9edb6e665b8740ec6643d80f078a089ef5f617 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 06:15:51 2013 +0000 Update translations for https_everywhere --- pt_BR/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/ssl-observatory.dtd b/pt_BR/ssl-observatory.dtd index cb0e3cc..158dae3 100644 --- a/pt_BR/ssl-observatory.dtd +++ b/pt_BR/ssl-observatory.dtd @@ -83,7 +83,7 @@ Passe o mouse sobre as opções para ver mais detalhes:"> <!ENTITY ssl-observatory.prefs.use "Usar este Observatório?"> <!ENTITY ssl-observatory.warning.title "AVISO do Observatório SSL de EFF"> -<!ENTITY ssl-observatory.warning.showcert "Mostre a corrente do certificado"> +<!ENTITY ssl-observatory.warning.showcert "Mostre o certificado da corrente"> <!ENTITY ssl-observatory.warning.okay "Eu entendo"> <!ENTITY ssl-observatory.warning.text "O Observatório SSL de EFF emitiu um aviso sobre o(s) certificados(s) HTTPS para este site:"> <!ENTITY ssl-observatory.warning.defense "Se você estiver entrado neste site, é aconselhável trocar sua senha assim que você tiver uma conexão segura.">

1 0

[goptlib/master] Sexy godoc output.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit 86cdde20fe2830e2d0ea6a1f21d494fbc2a2078c Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 25 21:41:43 2013 -0800 Sexy godoc output. --- examples/dummy-client/dummy-client.go | 13 +++--- examples/dummy-server/dummy-server.go | 15 ++++--- pt.go | 79 +++++++++++++++++---------------- socks/socks.go | 21 ++++++++- 4 files changed, 78 insertions(+), 50 deletions(-) diff --git a/examples/dummy-client/dummy-client.go b/examples/dummy-client/dummy-client.go index 5d96549..783788a 100644 --- a/examples/dummy-client/dummy-client.go +++ b/examples/dummy-client/dummy-client.go @@ -1,10 +1,13 @@ +// Dummy no-op pluggable transport client. Works only as a managed proxy. +// // Usage (in torrc): -// UseBridges 1 -// Bridge dummy X.X.X.X:YYYY -// ClientTransportPlugin dummy exec dummy-client +// UseBridges 1 +// Bridge dummy X.X.X.X:YYYY +// ClientTransportPlugin dummy exec dummy-client +// // Because this transport doesn't do anything to the traffic, you can use any -// ordinary relay's ORPort in the Bridge line. - +// ordinary relay's ORPort in the Bridge line; it doesn't have to declare +// support for the dummy transport. package main import ( diff --git a/examples/dummy-server/dummy-server.go b/examples/dummy-server/dummy-server.go index 599a5bf..86176d7 100644 --- a/examples/dummy-server/dummy-server.go +++ b/examples/dummy-server/dummy-server.go @@ -1,9 +1,14 @@ +// Dummy no-op pluggable transport server. Works only as a managed proxy. +// // Usage (in torrc): -// BridgeRelay 1 -// ORPort 9001 -// ExtORPort 6669 -// ServerTransportPlugin dummy exec dummy-server - +// BridgeRelay 1 +// ORPort 9001 +// ExtORPort 6669 +// ServerTransportPlugin dummy exec dummy-server +// +// Because the dummy transport doesn't do anything to the traffic, you can +// connect to it with any ordinary Tor client; you don't have to use +// dummy-client. package main import ( diff --git a/pt.go b/pt.go index 03c2314..eb7048b 100644 --- a/pt.go +++ b/pt.go @@ -1,50 +1,53 @@ -// Tor pluggable transports library. +// Package pt implements the Tor pluggable transports specification. // // Sample client usage: -// -// import "git.torproject.org/pluggable-transports/goptlib.git" -// var ptInfo pt.ClientInfo -// var err error -// ptInfo, err := pt.ClientSetup([]string{"foo"}) -// if err != nil { -// os.Exit(1) -// } -// for _, methodName := range ptInfo.MethodNames { -// ln, err := startSocksListener() +// var ptInfo pt.ClientInfo +// var err error +// ptInfo, err = pt.ClientSetup([]string{"foo"}) // if err != nil { -// pt.CmethodError(methodName, err.Error()) -// continue +// os.Exit(1) +// } +// for _, methodName := range ptInfo.MethodNames { +// ln, err := startSocksListener() +// if err != nil { +// pt.CmethodError(methodName, err.Error()) +// continue +// } +// pt.Cmethod(methodName, "socks4", ln.Addr()) // } -// pt.Cmethod(methodName, "socks4", ln.Addr()) -// } -// pt.CmethodsDone() +// pt.CmethodsDone() +// See the socks package for help with writing a SOCKS listener. // // Sample server usage: -// -// import "git.torproject.org/pluggable-transports/goptlib.git" -// var ptInfo pt.ServerInfo -// var err error -// ptInfo, err = pt.ServerSetup([]string{"foo", "bar"}) -// if err != nil { -// os.Exit(1) -// } -// for _, bindaddr := range ptInfo.Bindaddrs { -// ln, err := startListener(bindaddr.Addr, bindaddr.MethodName) -// if err != nil { -// pt.SmethodError(bindaddr.MethodName, err.Error()) -// continue +// func handler(conn net.Conn) { +// or, err := pt.ConnectOr(&ptInfo, conn, "foo") +// if err != nil { +// return +// } +// // do something with or and conn // } -// pt.Smethod(bindaddr.MethodName, ln.Addr()) -// } -// pt.SmethodsDone() -// func handler(conn net.Conn, methodName string) { -// or, err := pt.ConnectOr(&ptInfo, conn, methodName) +// ... +// var ptInfo pt.ServerInfo +// var err error +// ptInfo, err = pt.ServerSetup([]string{"foo"}) // if err != nil { -// return +// os.Exit(1) // } -// // Do something with or and conn. -// } - +// for _, bindaddr := range ptInfo.Bindaddrs { +// ln, err := startListener(bindaddr.Addr, bindaddr.MethodName) +// if err != nil { +// pt.SmethodError(bindaddr.MethodName, err.Error()) +// continue +// } +// pt.Smethod(bindaddr.MethodName, ln.Addr()) +// } +// pt.SmethodsDone() +// +// Tor pluggable transports specification: +// https://gitweb.torproject.org/torspec.git/blob/HEAD:/pt-spec.txt. +// +// Extended ORPort Authentication: +// https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/217-ext-orpo…. package pt import ( diff --git a/socks/socks.go b/socks/socks.go index 788d53c..b82fba7 100644 --- a/socks/socks.go +++ b/socks/socks.go @@ -1,5 +1,7 @@ -// SOCKS4a server library. - +// Package socks implements a SOCKS4a server sufficient for a Tor client +// transport plugin. +// +// http://ftp.icm.edu.pl/packages/socks/socks4/SOCKS4.protocol package socks import ( @@ -22,6 +24,21 @@ const ( // requested destination string. If the callback returns an error, sends a SOCKS // request failed message. Otherwise, sends a SOCKS request granted message for // the destination address returned by the callback. +// var remote net.Conn +// err := socks.AwaitSocks4aConnect(local.(*net.TCPConn), func(dest string) (*net.TCPAddr, error) { +// var err error +// // set remote in outer function environment +// remote, err = net.Dial("tcp", dest) +// if err != nil { +// return nil, err +// } +// return remote.RemoteAddr().(*net.TCPAddr), nil +// }) +// if err != nil { +// return err +// } +// defer remote.Close() +// copyLoop(local, remote) func AwaitSocks4aConnect(conn *net.TCPConn, connect func(string) (*net.TCPAddr, error)) error { dest, err := readSocks4aConnect(conn) if err != nil {

1 0

[goptlib/master] ptErr isn't exposed.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit c36f6116428cbf66f4687dbd5042c1c42f04a560 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 25 21:47:21 2013 -0800 ptErr isn't exposed. --- pt.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pt.go b/pt.go index b2ec0fe..03c2314 100644 --- a/pt.go +++ b/pt.go @@ -163,23 +163,26 @@ func doError(keyword string, v ...string) *ptErr { return &ptErr{keyword, v} } -// Emit an ENV-ERROR line with explanation text. Return the error as a ptErr. +// Emit an ENV-ERROR line with explanation text. Returns a representation of the +// error. func EnvError(msg string) error { return doError("ENV-ERROR", msg) } -// Emit a VERSION-ERROR line with explanation text. Return the error as a ptErr. +// Emit a VERSION-ERROR line with explanation text. Returns a representation of +// the error. func VersionError(msg string) error { return doError("VERSION-ERROR", msg) } -// Emit a CMETHOD-ERROR line with explanation text. Return the error as a ptErr. +// Emit a CMETHOD-ERROR line with explanation text. Returns a representation of +// the error. func CmethodError(methodName, msg string) error { return doError("CMETHOD-ERROR", methodName, msg) } -// Emit an SMETHOD-ERROR line with explanation text. Return the error as a -// ptErr. +// Emit an SMETHOD-ERROR line with explanation text. Returns a representation of +// the error. func SmethodError(methodName, msg string) error { return doError("SMETHOD-ERROR", methodName, msg) }

1 0

[goptlib/master] Prevent messages from going to stdout in tests.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit c661fbaf9d4e121a26e629cc9e8e6b7a64174129 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 25 21:08:09 2013 -0800 Prevent messages from going to stdout in tests. We might later want to actually test what these messages look like; we can replace Stdout with e.g. a bytes.Buffer to do that. --- pt_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pt_test.go b/pt_test.go index ee471fa..979dd56 100644 --- a/pt_test.go +++ b/pt_test.go @@ -2,6 +2,7 @@ package pt import ( "bytes" + "io/ioutil" "net" "os" "sort" @@ -59,6 +60,8 @@ func TestGetManagedTransportVer(t *testing.T) { {"2,1", "1"}, } + Stdout = ioutil.Discard + os.Clearenv() _, err := getManagedTransportVer() if err == nil { @@ -159,6 +162,8 @@ func TestGetClientTransports(t *testing.T) { }, } + Stdout = ioutil.Discard + os.Clearenv() _, err := getClientTransports([]string{"alpha", "beta", "gamma"}) if err == nil { @@ -299,6 +304,8 @@ func TestGetServerBindaddrs(t *testing.T) { }, } + Stdout = ioutil.Discard + os.Clearenv() _, err := getServerBindaddrs([]string{"alpha", "beta", "gamma"}) if err == nil {

1 0

[goptlib/master] Add Stdout variable.
by dcf＠torproject.org 27 Nov '13

27 Nov '13

commit dc4c80ed55e770e9359d4d262cd15d99cd7bb80a Author: David Fifield <david(a)bamsoftware.com> Date: Mon Nov 25 21:04:07 2013 -0800 Add Stdout variable. One may redefine this variable to control where pluggable-transport messages are written, for example to hide them during testing or log them before they are written to the real stdout. --- pt.go | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/pt.go b/pt.go index ab2b78f..b2ec0fe 100644 --- a/pt.go +++ b/pt.go @@ -64,6 +64,40 @@ import ( "time" ) +// This type wraps a Write method and calls Sync after each Write. +type syncWriter struct { + *os.File +} + +// Call File.Write and then Sync. An error is returned if either operation +// returns an error. +func (w syncWriter) Write(p []byte) (n int, err error) { + n, err = w.File.Write(p) + if err != nil { + return + } + err = w.Sync() + return +} + +// Writer to which pluggable-transport negotiation messages are written. It +// defaults to a Writer that writes to os.Stdout and calls Sync after each +// write. +// +// You may, for example, log pluggable-transport messages by defining a Writer +// that logs what is written to it: +// type logWriteWrapper struct { +// io.Writer +// } +// +// func (w logWriteWrapper) Write(p []byte) (int, error) { +// log.Print(string(p)) +// return w.Writer.Write(p) +// } +// and then redefining Stdout: +// pt.Stdout = logWriteWrapper{pt.Stdout} +var Stdout io.Writer = syncWriter{os.Stdout} + // Represents an error that can happen during negotiation, for example // ENV-ERROR. When an error occurs, we print it to stdout and also pass it up // the return chain. @@ -117,11 +151,10 @@ func formatLine(keyword string, v ...string) string { return buf.String() } -// Print a pluggable transports protocol line to stdout. The line consists of an +// Print a pluggable transports protocol line to Stdout. The line consists of an // unescaped keyword, followed by any number of escaped strings. func Line(keyword string, v ...string) { - fmt.Println(formatLine(keyword, v...)) - os.Stdout.Sync() + fmt.Fprintln(Stdout, formatLine(keyword, v...)) } // Emit and return the given error as a ptErr.

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Nov '13

27 Nov '13

commit de1bb5329fb769474734ab882a78825e75c8d84f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 02:16:01 2013 +0000 Update translations for https_everywhere_completed --- pt_BR/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index f38f6d5..eb12aa0 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -3,7 +3,7 @@ <!ENTITY https-everywhere.about.ext_description "Criptografe a Web! Use utomaticamente a segurança HTTPS em diversos sites."> <!ENTITY https-everywhere.about.version "Versão"> <!ENTITY https-everywhere.about.created_by "Criado por"> -<!ENTITY https-everywhere.about.librarians "Bibliotecários dos Conjuntos de Regras"> +<!ENTITY https-everywhere.about.librarians "Conjuntos de Regras dos Bibliotecários"> <!ENTITY https-everywhere.about.thanks "Obrigado a"> <!ENTITY https-everywhere.about.contribute "Se você gostar do HTTPS Everywhere, considere"> <!ENTITY https-everywhere.about.donate_tor "Fazer uma doação para o Tor">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 27 Nov '13

27 Nov '13

commit 244efb28f5d43a6e119e41b7f22b258c11f48b05 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 02:15:57 2013 +0000 Update translations for https_everywhere --- pt_BR/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index f38f6d5..eb12aa0 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -3,7 +3,7 @@ <!ENTITY https-everywhere.about.ext_description "Criptografe a Web! Use utomaticamente a segurança HTTPS em diversos sites."> <!ENTITY https-everywhere.about.version "Versão"> <!ENTITY https-everywhere.about.created_by "Criado por"> -<!ENTITY https-everywhere.about.librarians "Bibliotecários dos Conjuntos de Regras"> +<!ENTITY https-everywhere.about.librarians "Conjuntos de Regras dos Bibliotecários"> <!ENTITY https-everywhere.about.thanks "Obrigado a"> <!ENTITY https-everywhere.about.contribute "Se você gostar do HTTPS Everywhere, considere"> <!ENTITY https-everywhere.about.donate_tor "Fazer uma doação para o Tor">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 27 Nov '13

27 Nov '13

commit 4f42289b155694cb8bb372edefb31b489d197d80 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 02:15:53 2013 +0000 Update translations for whisperback_completed --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 8948ce5..0a26ebb 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -4,6 +4,7 @@ # # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 +# ebonsi, 2013 # Augustine <evandro(a)geocities.com>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 # betodso <beto.cpv(a)gmail.com>, 2013 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-11-02 01:01+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-11-27 02:10+0000\n" +"Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgstr "Enviando e-mail" #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "Esta tarefa pode demorar alguns instantes..." +msgstr "Esta tarefa pode demorar algum tempo..." #: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid."

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 27 Nov '13

27 Nov '13

commit d36221ba9b407954ad26542c1a49718c5671215f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 02:15:50 2013 +0000 Update translations for whisperback --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 8948ce5..0a26ebb 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -4,6 +4,7 @@ # # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 +# ebonsi, 2013 # Augustine <evandro(a)geocities.com>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 # betodso <beto.cpv(a)gmail.com>, 2013 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-11-02 01:01+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"PO-Revision-Date: 2013-11-27 02:10+0000\n" +"Last-Translator: ebonsi\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +63,7 @@ msgstr "Enviando e-mail" #. pylint: disable=C0301 #: ../whisperBack/gui.py:223 msgid "This could take a while..." -msgstr "Esta tarefa pode demorar alguns instantes..." +msgstr "Esta tarefa pode demorar algum tempo..." #: ../whisperBack/gui.py:237 msgid "The contact email adress doesn't seem valid."

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 27 Nov '13

27 Nov '13

commit 1b9d4210ef7b2824f76d7efe87a5722ba460fbf1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 27 01:45:57 2013 +0000 Update translations for https_everywhere_completed --- pt_BR/https-everywhere.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt_BR/https-everywhere.properties b/pt_BR/https-everywhere.properties index 3a161d5..a3da3b3 100644 --- a/pt_BR/https-everywhere.properties +++ b/pt_BR/https-everywhere.properties @@ -1,8 +1,8 @@ -https-everywhere.menu.globalEnable = Habilitar HTTPS Everywhere -https-everywhere.menu.globalDisable = Desabilitar HTTPS Everywhere -https-everywhere.menu.enableDisable = Habilitar / Desabilitar Regras +https-everywhere.menu.globalEnable = Habilitar o HTTPS em todo lugar +https-everywhere.menu.globalDisable = Desabilitar o HTTPS em todo lugar +https-everywhere.menu.enableDisable = Habilitar / Desabilitar as Regras https-everywhere.menu.noRules = (Não há Regras para Esta Página) -https-everywhere.menu.unknownRules = (Regras Desconhecidas para Esta Página) -https-everywhere.toolbar.hint = HTTPS Everywhere foi ativado. Você pode habilitá-lo individualmente para cada site, clicando no ícone na barra de endereços. -https-everywhere.migration.notification0 = Para implementar uma reparação crucial, esta atualização limpa sua preferência de regras do HTTPS Everywhere para valores padrão. -https-everywhere.menu.ruleset-tests = Executar testes no conjunto de regras do HTTPS Everywhere +https-everywhere.menu.unknownRules = (As regras para Está Página são Desconhecidas) +https-everywhere.toolbar.hint = HTTPS em todo lugar foi ativado. Você pode alterná-lo para um site ou outro, clicando no ícone na barra de endereços. +https-everywhere.migration.notification0 = Para implementar uma reparação crucial, esta atualização redefine suas preferências de regras do HTTPS em todo lugar para os valores padrão. +https-everywhere.menu.ruleset-tests = Execute os Testes de Conjunto de Regras para o HTTPS em todo lugar

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
118
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2013