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

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 24 May '16

24 May '16

commit 02a4100e2eed63caecdce02395a95abb76c43f14 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:16:59 2016 +0000 Update translations for tails-onioncircuits --- pt_BR/onioncircuits.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/onioncircuits.pot b/pt_BR/onioncircuits.pot index bf8ef04..41aef31 100644 --- a/pt_BR/onioncircuits.pot +++ b/pt_BR/onioncircuits.pot @@ -5,14 +5,14 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2016 # Maicon Grahl <maicongrahl(a)hotmail.com>, 2016 -# rhcastilhos <rhcastilhos(a)gmail.com>, 2016 +# Rodrigo Horstmann Castilhos <rhcastilhos(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-03-31 21:31+0200\n" -"PO-Revision-Date: 2016-04-01 23:46+0000\n" -"Last-Translator: rhcastilhos <rhcastilhos(a)gmail.com>\n" +"PO-Revision-Date: 2016-05-24 20:52+0000\n" +"Last-Translator: Rodrigo Horstmann Castilhos <rhcastilhos(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed
by translation＠torproject.org 24 May '16

24 May '16

commit 455fff3837d534110dae18bbf2378510601c02e3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:16:35 2016 +0000 Update translations for tor-messenger-fingerdtd_completed --- pt_BR/finger.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pt_BR/finger.dtd b/pt_BR/finger.dtd index 10ba9d4..6814b2e 100644 --- a/pt_BR/finger.dtd +++ b/pt_BR/finger.dtd @@ -7,4 +7,9 @@ <!ENTITY finger.protocol "Protocolo"> <!ENTITY finger.verify "Verificar"> <!ENTITY finger.remove "Remover"> -<!ENTITY finger.intro "Administrar a lista de impressões digitais que você viu."> \ No newline at end of file +<!ENTITY finger.intro "Administrar a lista de impressões digitais que você viu."> +<!ENTITY addFingerDialog.title "Adicionar impressão digital"> +<!ENTITY addFingerDialog.finger "Impressão digital"> +<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.cancel "Pular"> +<!ENTITY addFingerDialog.tooltip "Caso você saiba os 40 caracteres de impressão digital da chave privada OTR do seu contato, digite-a agora."> \ No newline at end of file

1 0

[translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd
by translation＠torproject.org 24 May '16

24 May '16

commit dc5a9fcbeefd8bb7373f6d969b0ea08749b396a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:16:31 2016 +0000 Update translations for tor-messenger-fingerdtd --- pt_BR/finger.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pt_BR/finger.dtd b/pt_BR/finger.dtd index 1cff584..6814b2e 100644 --- a/pt_BR/finger.dtd +++ b/pt_BR/finger.dtd @@ -8,8 +8,8 @@ <!ENTITY finger.verify "Verificar"> <!ENTITY finger.remove "Remover"> <!ENTITY finger.intro "Administrar a lista de impressões digitais que você viu."> -<!ENTITY addFingerDialog.title "Add Fingerprint"> -<!ENTITY addFingerDialog.finger "Fingerprint"> +<!ENTITY addFingerDialog.title "Adicionar impressão digital"> +<!ENTITY addFingerDialog.finger "Impressão digital"> <!ENTITY addFingerDialog.accept "OK"> -<!ENTITY addFingerDialog.cancel "Skip"> -<!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file +<!ENTITY addFingerDialog.cancel "Pular"> +<!ENTITY addFingerDialog.tooltip "Caso você saiba os 40 caracteres de impressão digital da chave privada OTR do seu contato, digite-a agora."> \ No newline at end of file

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 24 May '16

24 May '16

commit 125629c0536af5d72b663c0f2dd09fbc0a9a5f34 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:15:40 2016 +0000 Update translations for tor-launcher-properties_completed --- pt_BR/torlauncher.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index ba53e12..eafba56 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -3,6 +3,7 @@ torlauncher.error_title=Inicializador do Tor +torlauncher.tor_exited_during_startup=Tor fechou inesperadamente. Isso pode ser devido um erro no Tor, ou em outro programa ou por falha no hardware. Até que você conserte o problema e reinicie o Tor, o Navegador Tor não será iniciado. torlauncher.tor_exited=O Tor fechou inesperadamente. Isso pode ser devido a um bug no Tor em si, a um outro programa no seu sistema, ou a um problema com o equipamento. O navegador Tor não poderá acessar nenhum website até que você o reinicie. Se o problema persistir, por favor envie uma cópia do seu Tor Log para a equipe responsável pela assistência. torlauncher.tor_exited2=Ao reiniciar o Tor, as abas do seu navegador não serão fechadas. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle do Tor.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 24 May '16

24 May '16

commit 680905e54ca6bec92a8c46148160422920864bd0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:15:37 2016 +0000 Update translations for tor-launcher-properties --- pt_BR/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties index a61b0b0..eafba56 100644 --- a/pt_BR/torlauncher.properties +++ b/pt_BR/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=Inicializador do Tor -torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. +torlauncher.tor_exited_during_startup=Tor fechou inesperadamente. Isso pode ser devido um erro no Tor, ou em outro programa ou por falha no hardware. Até que você conserte o problema e reinicie o Tor, o Navegador Tor não será iniciado. torlauncher.tor_exited=O Tor fechou inesperadamente. Isso pode ser devido a um bug no Tor em si, a um outro programa no seu sistema, ou a um problema com o equipamento. O navegador Tor não poderá acessar nenhum website até que você o reinicie. Se o problema persistir, por favor envie uma cópia do seu Tor Log para a equipe responsável pela assistência. torlauncher.tor_exited2=Ao reiniciar o Tor, as abas do seu navegador não serão fechadas. torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle do Tor.

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 24 May '16

24 May '16

commit 4fb009ace2e0e8fa5f37af0a7007e330eaf6eee6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:15:31 2016 +0000 Update translations for torbirdy_completed --- pt_BR/torbirdy.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties index 0c38392..78feee8 100644 --- a/pt_BR/torbirdy.properties +++ b/pt_BR/torbirdy.properties @@ -6,6 +6,7 @@ torbirdy.enabled.custom=TorBirdy Habilitado: Proxy Personalizado torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparente torbirdy.enabled.whonix=TorBirdy Habilitado: Whonix torbirdy.disabled=TorBirdy: Desabilitado! +torbirdy.enabled=TorBirdy: Habilitado torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração automática do Thunderbird para proteger seu anonimato.\nAs configurações de segurança recomendadas para %S foram definidas.\nAgora você pode definir as configurações de uma outra conta manualmente.

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 24 May '16

24 May '16

commit 9164a8fd4844927379421d6e49f515ea29db2797 Author: Translation commit bot <translation(a)torproject.org> Date: Tue May 24 21:15:27 2016 +0000 Update translations for torbirdy --- pt_BR/torbirdy.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties index 048e2d2..78feee8 100644 --- a/pt_BR/torbirdy.properties +++ b/pt_BR/torbirdy.properties @@ -6,7 +6,7 @@ torbirdy.enabled.custom=TorBirdy Habilitado: Proxy Personalizado torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparente torbirdy.enabled.whonix=TorBirdy Habilitado: Whonix torbirdy.disabled=TorBirdy: Desabilitado! -torbirdy.enabled=TorBirdy: Enabled +torbirdy.enabled=TorBirdy: Habilitado torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração automática do Thunderbird para proteger seu anonimato.\nAs configurações de segurança recomendadas para %S foram definidas.\nAgora você pode definir as configurações de uma outra conta manualmente.

1 0

[tor-launcher/maint-0.2.9] Bump version for new tag
by gk＠torproject.org 24 May '16

24 May '16

commit c1254f115537fc415d8c1ef22624b7a171afb4fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 24 20:33:24 2016 +0000 Bump version for new tag --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index c95315e..7598b60 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.9.2</em:version> + <em:version>0.2.9.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/maint-0.2.9] Bug 18947: not starting on OS X if put into /Applications
by gk＠torproject.org 24 May '16

24 May '16

commit 0f2d55e7426586d46e3d597b1e839908e2dd7c65 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 16 10:48:51 2016 -0400 Bug 18947: not starting on OS X if put into /Applications Display a better error message if tor exits and Tor Launcher was never able to establish a connection to the control port (pointing users to a possible error in their torrc may help them find and fix the startup problem themselves). --- src/components/tl-process.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index aba6456..403bc56 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -150,8 +150,25 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + let s; + if (!this.mDidConnectToTorControlPort) + { + // The "tor_exited_during_startup" property string was added in + // May 2016. If it is available, we use it; otherwise, we fall back + // to the older "tor_exited" message (below). Once this new string + // has been translated into all of the languages that we ship, we + // can simplify this code. + let key = "tor_exited_during_startup"; + s = TorLauncherUtil.getLocalizedString(key) + if (s == key) // No string found for key. + s = undefined; + } + + if (!s) + { + s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); + } TorLauncherLogger.log(4, s); var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); var cancelBtnLabel = "OK"; @@ -178,6 +195,7 @@ TorProcessService.prototype = var haveConnection = this.mProtocolSvc.TorHaveControlConnection(); if (haveConnection) { + this.mDidConnectToTorControlPort = true; this.mControlConnTimer = null; this.mTorProcessStatus = this.kStatusRunning; this.mProtocolSvc.TorStartEventMonitor(); @@ -285,6 +303,7 @@ TorProcessService.prototype = // Private Member Variables //////////////////////////////////////////////// mTorProcessStatus: 0, // kStatusUnknown + mDidConnectToTorControlPort: false, // Have we ever made a connection? mIsBootstrapDone: false, mBootstrapErrorOccurred: false, mIsQuitting: false,

1 0

[snowflake/master] webRTCConn has better seam with BytesLogger interface
by serene＠torproject.org 24 May '16

24 May '16

commit b2c9fcac5e9d560e4e8165ef2f1cf8f2cf67f967 Author: Serene Han <keroserene+git(a)gmail.com> Date: Tue May 24 12:56:09 2016 -0700 webRTCConn has better seam with BytesLogger interface --- client/client_test.go | 6 +----- client/snowflake.go | 14 +++++++++++++- client/util.go | 23 +++++++++++++++++++---- client/webrtc.go | 16 ++++++---------- 4 files changed, 39 insertions(+), 20 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 93e0422..1ccf206 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -109,11 +109,7 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("WebRTC Connection", func() { - c := new(webRTCConn) - c.BytesInfo = &BytesInfo{ - inboundChan: make(chan int), outboundChan: make(chan int), - inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, - } + c := NewWebRTCConnection(nil, nil) So(c.buffer.Bytes(), ShouldEqual, nil) Convey("Can construct a WebRTCConn", func() { diff --git a/client/snowflake.go b/client/snowflake.go index 61864ca..464420c 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -66,6 +66,7 @@ type SnowflakeChannel interface { // updated once multiplexed transport on a single circuit is available. type Peers struct { Tongue + BytesLogger snowflakeChan chan *webRTCConn current *webRTCConn @@ -88,6 +89,7 @@ func (p *Peers) FindSnowflake() (*webRTCConn, error) { return nil, errors.New(s) } connection, err := p.Catch() + connection.BytesLogger = p.BytesLogger if err != nil { return nil, err } @@ -96,7 +98,11 @@ func (p *Peers) FindSnowflake() (*webRTCConn, error) { // TODO: Needs fixing. func (p *Peers) Count() int { - return len(p.snowflakeChan) + count := 0 + if p.current != nil { + count = 1 + } + return count + len(p.snowflakeChan) } // Close all remote peers. @@ -257,6 +263,12 @@ func main() { remotes := NewPeers(SnowflakeCapacity) broker := NewBrokerChannel(brokerURL, frontDomain, CreateBrokerTransport()) + remotes.BytesLogger = &BytesSyncLogger{ + inboundChan: make(chan int, 5), outboundChan: make(chan int, 5), + inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, + } + go remotes.BytesLogger.Log() + remotes.Tongue = WebRTCDialer{broker} go ConnectLoop(remotes) diff --git a/client/util.go b/client/util.go index 6a2b6de..73f0f50 100644 --- a/client/util.go +++ b/client/util.go @@ -29,7 +29,22 @@ func (i *IceServerList) Set(s string) error { return nil } -type BytesInfo struct { +type BytesLogger interface { + Log() + AddOutbound(int) + AddInbound(int) +} + +// Default BytesLogger does nothing. +type BytesNullLogger struct{} + +func (b BytesNullLogger) Log() {} +func (b BytesNullLogger) AddOutbound(amount int) {} +func (b BytesNullLogger) AddInbound(amount int) {} + +// BytesSyncLogger uses channels to safely log from multiple sources with output +// occuring at reasonable intervals. +type BytesSyncLogger struct { outboundChan chan int inboundChan chan int outbound int @@ -39,7 +54,7 @@ type BytesInfo struct { isLogging bool } -func (b *BytesInfo) Log() { +func (b *BytesSyncLogger) Log() { b.isLogging = true var amount int output := func() { @@ -76,14 +91,14 @@ func (b *BytesInfo) Log() { } } -func (b *BytesInfo) AddOutbound(amount int) { +func (b *BytesSyncLogger) AddOutbound(amount int) { if !b.isLogging { return } b.outboundChan <- amount } -func (b *BytesInfo) AddInbound(amount int) { +func (b *BytesSyncLogger) AddInbound(amount int) { if !b.isLogging { return } diff --git a/client/webrtc.go b/client/webrtc.go index e01cbf7..a47ac19 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -29,7 +29,8 @@ type webRTCConn struct { index int closed bool - *BytesInfo + + BytesLogger } func (c *webRTCConn) Read(b []byte) (int, error) { @@ -38,7 +39,7 @@ func (c *webRTCConn) Read(b []byte) (int, error) { // Writes bytes out to the snowflake proxy. func (c *webRTCConn) Write(b []byte) (int, error) { - c.BytesInfo.AddOutbound(len(b)) + c.BytesLogger.AddOutbound(len(b)) if nil == c.snowflake { log.Printf("Buffered %d bytes --> WebRTC", len(b)) c.buffer.Write(b) @@ -99,13 +100,8 @@ func NewWebRTCConnection(config *webrtc.Configuration, connection.errorChannel = make(chan error, 1) connection.reset = make(chan struct{}, 1) - // TODO: Separate out. - // Log every few seconds. - connection.BytesInfo = &BytesInfo{ - inboundChan: make(chan int, 5), outboundChan: make(chan int, 5), - inbound: 0, outbound: 0, inEvents: 0, outEvents: 0, - } - go connection.BytesInfo.Log() + // Override with something that's not NullLogger to have real logging. + connection.BytesLogger = &BytesNullLogger{} // Pipes remain the same even when DataChannel gets switched. connection.recvPipe, connection.writePipe = io.Pipe() @@ -224,7 +220,7 @@ func (c *webRTCConn) establishDataChannel() error { if len(msg) <= 0 { log.Println("0 length message---") } - c.BytesInfo.AddInbound(len(msg)) + c.BytesLogger.AddInbound(len(msg)) n, err := c.writePipe.Write(msg) if err != nil { // TODO: Maybe shouldn't actually close.

1 0