- tor-commits - lists.torproject.org

[tor/master] test_options.c: assert that TransProxyType is tested
by nickm＠torproject.org 21 Mar '16

21 Mar '16

commit a42938c07670162863decc952b4d73681d9302d6 Author: Steven Chamberlain <steven(a)pyro.eu.org> Date: Fri Mar 18 13:17:18 2016 +0000 test_options.c: assert that TransProxyType is tested If a new platform defines USE_TRANSPARENT, ensure that a test runs for its TransProxyType. --- src/test/test_options.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_options.c b/src/test/test_options.c index 9ea5718..bd00e61 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1102,6 +1102,9 @@ test_options_validate__transproxy(void *ignored) tt_assert(!msg); #endif + // Assert that a test has run for some TransProxyType + tt_assert(tdata); + #else tdata = get_options_test_data("TransPort 127.0.0.1:555\n");

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 21 Mar '16

21 Mar '16

commit eeaf3097a50ebed86f59c9a0ec7c4df2f38ef3fb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 21 12:45:57 2016 +0000 Update translations for torbutton-torbuttonproperties --- es/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/torbutton.properties b/es/torbutton.properties index 319f5e7..a29234b 100644 --- a/es/torbutton.properties +++ b/es/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=Problema del perfil %S profileReadOnly=No puede ejecutar %S desde un sistema de ficheros de solo-lectura. Copie %S a otra ubicación antes de intentar usarlo. profileReadOnlyMac=No puede ejecutar %S desde un sistema de ficheros de solo-lectura. Copie %S a su escritorio o la carpeta de aplicaciones antes de intentar usarlo. profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permisos de su sistema de ficheros e inténtelo de nuevo. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=Ha ocurrido un error en la migración de su perfil %S. \nSe usarán los nuevos ajustes.

1 0

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

21 Mar '16

commit 61f84b38a7a8759ddd7867208ee05c71194d8d3a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 21 12:45:38 2016 +0000 Update translations for tor-launcher-properties_completed --- es/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index 42780e5..5283bd1 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Arranque de Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. -torlauncher.torrc_missing=No se encuentra el archivo "torrc" -torlauncher.datadir_missing=El directorio de datos de Tor no existe. +torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado. +torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S

1 0

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

21 Mar '16

commit 22c387d67ba05addbbb41607b3d5637ba4844e95 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 21 12:45:33 2016 +0000 Update translations for tor-launcher-properties --- es/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/torlauncher.properties b/es/torlauncher.properties index fa78ce9..5283bd1 100644 --- a/es/torlauncher.properties +++ b/es/torlauncher.properties @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=No existe el fichero torcc y no puede ser creado. +torlauncher.datadir_missing=El directorio de datos de Tor no existe y no puede ser creado torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. torlauncher.failed_to_get_settings=No se pudo recuperar las preferencias de Tor.\n\n%S

1 0

[tor-browser-bundle/master] Bug 13252: OS X nightly builds should use the new layout
by gk＠torproject.org 20 Mar '16

20 Mar '16

commit 03680a64d899a2f86c710ea764c2d2aac796539a Author: Georg Koppen <gk(a)torproject.org> Date: Sun Mar 20 20:26:31 2016 +0000 Bug 13252: OS X nightly builds should use the new layout --- gitian/versions.nightly | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index f3d0937..ae38daf 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -8,6 +8,9 @@ BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 +# DATA_OUTSIDE_APP_DIR is only implemented for Mac OS. +DATA_OUTSIDE_APP_DIR=1 + # If you remove MULTI_LINGUAL=1, be sure to use a version of Tor Launcher # that does not include the language prompt. MULTI_LINGUAL=1

1 0

[snowflake/master] defer conn.Close for simplicity and remove unnecessary goroutines, improve error handling (close #12)
by arlo＠torproject.org 20 Mar '16

20 Mar '16

commit b8815627bd189c3ee0829ce09152684726c6933c Author: Serene Han <keroserene+git(a)gmail.com> Date: Sat Mar 19 22:33:54 2016 -0700 defer conn.Close for simplicity and remove unnecessary goroutines, improve error handling (close #12) --- client/snowflake.go | 30 ++++++++++-------------------- client/webrtc.go | 22 ++++++++++------------ 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 5fe55a9..15f9b37 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -35,15 +35,12 @@ const ( func copyLoop(a, b net.Conn) { var wg sync.WaitGroup wg.Add(2) - // TODO fix copy loop recovery go func() { - written, err := io.Copy(b, a) - log.Println("copy loop b-a break", err, written) + io.Copy(b, a) wg.Done() }() go func() { - written, err := io.Copy(a, b) - log.Println("copy loop a-b break", err, written) + io.Copy(a, b) wg.Done() }() wg.Wait() @@ -66,11 +63,9 @@ func dialWebRTC() (*webRTCConn, error) { if nil == broker { return nil, errors.New("Failed to prepare BrokerChannel") } - connection := NewWebRTCConnection(config, broker) - go connection.ConnectLoop() - - return connection, nil + err := connection.Connect() + return connection, err } func endWebRTC() { @@ -97,14 +92,9 @@ func handler(conn *pt.SocksConn) error { return err } defer remote.Close() + defer conn.Close() webrtcRemote = remote - // Induce another call to handler - go func() { - <-remote.reset - conn.Close() - }() - err = conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0}) if err != nil { return err @@ -112,8 +102,10 @@ func handler(conn *pt.SocksConn) error { // TODO: Make SOCKS acceptance more independent from WebRTC so they can // be more easily interchanged. - copyLoop(conn, remote) - log.Println("----END---") + go copyLoop(conn, remote) + // When WebRTC resets, close the SOCKS connection, which induces new handler. + <-remote.reset + log.Println("---- Closed ---") return nil } @@ -159,7 +151,6 @@ func readSignalingMessages(f *os.File) { } func main() { - // var err error webrtc.SetLoggingVerbosity(1) logFile, err := os.OpenFile("snowflake.log", os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { @@ -174,8 +165,7 @@ func main() { flag.Var(&iceServers, "ice", "comma-separated list of ICE servers") flag.Parse() - // Expect user to copy-paste if - // TODO: Maybe just get rid of copy-paste entirely. + // TODO: Maybe just get rid of copy-paste option entirely. if "" != brokerURL { log.Println("Rendezvous using Broker at: ", brokerURL) if "" != frontDomain { diff --git a/client/webrtc.go b/client/webrtc.go index 2be31b5..1300212 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "errors" "fmt" "github.com/keroserene/go-webrtc" "io" @@ -99,26 +100,24 @@ func NewWebRTCConnection(config *webrtc.Configuration, return connection } -// WebRTC re-establishment loop. Expected in own goroutine. -func (c *webRTCConn) ConnectLoop() { +// TODO: Multiplex. +func (c *webRTCConn) Connect() error { log.Println("Establishing WebRTC connection...") // TODO: When go-webrtc is more stable, it's possible that a new // PeerConnection won't need to be re-prepared each time. err := c.preparePeerConnection() if err != nil { - log.Println("WebRTC: Could not create PeerConnection.") - return + return err } err = c.establishDataChannel() if err != nil { - log.Println("WebRTC: Could not establish DataChannel.") - } else { - go c.exchangeSDP() - <-c.reset - log.Println(" --- snowflake connection reset ---") + return errors.New("WebRTC: Could not establish DataChannel.") } - <-time.After(time.Second * 1) - c.cleanup() + err = c.exchangeSDP() + if err != nil { + return err + } + return nil } // Create and prepare callbacks on a new WebRTC PeerConnection. @@ -277,7 +276,6 @@ func (c *webRTCConn) exchangeSDP() error { answer = nil } } - log.Printf("Received Answer:\n\n%s\n", answer.Sdp) err := c.pc.SetRemoteDescription(answer) if nil != err {

1 0

[snowflake/master] Redundant close
by arlo＠torproject.org 20 Mar '16

20 Mar '16

commit ed60c74686b00fa92270391caecce5d368441766 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sun Mar 20 08:48:49 2016 -0700 Redundant close --- client/snowflake.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 15f9b37..c78eed0 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -55,7 +55,6 @@ type SnowflakeChannel interface { // Initialize a WebRTC Connection. func dialWebRTC() (*webRTCConn, error) { - // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. config := webrtc.NewConfiguration(iceServers...) @@ -92,7 +91,6 @@ func handler(conn *pt.SocksConn) error { return err } defer remote.Close() - defer conn.Close() webrtcRemote = remote err = conn.Grant(&net.TCPAddr{IP: net.IPv4zero, Port: 0})

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit bf187aabafba21be8e7d4cafc1eb7b90ec8640f3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:46:54 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- nb/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nb/irc.properties b/nb/irc.properties index f075fcf..134159e 100644 --- a/nb/irc.properties +++ b/nb/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=En feil inntraff i forsendelsen av forrige melding. Prø # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=Du kan ikke ta del i %1$S, og ble automatisk videresendt til %2$S. +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' er ikke en gyldig bruker-modus på denne serveren. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit 2ea1327b4346ff25dc9f9d9db10d564970c6341d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:46:50 2016 +0000 Update translations for tor-messenger-ircproperties --- nb/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nb/irc.properties b/nb/irc.properties index 79167e6..134159e 100644 --- a/nb/irc.properties +++ b/nb/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=En feil inntraff i forsendelsen av forrige melding. Prø error.channelForward=Du kan ikke ta del i %1$S, og ble automatisk videresendt til %2$S. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' er ikke en gyldig bruker-modus på denne serveren. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

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

20 Mar '16

commit afd7c736b447f911d63507d88fc968882bfa8aa6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:45:48 2016 +0000 Update translations for tor-launcher-properties_completed --- nb/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index cdbad0e..7accfd1 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Tor Launcher @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S). torlauncher.unable_to_start_tor=Kunne ikke starte Tor.\n\n%S torlauncher.tor_missing=Den kjørbare Tor-filen finnes ikke. -torlauncher.torrc_missing=torrc filen finnes ikke. -torlauncher.datadir_missing=Datamappen til Tor finnes ikke. +torlauncher.torrc_missing=torrc fil mangler og kunne ikke opprettes. +torlauncher.datadir_missing=Tor data katalog eksisterer ikke og kunne ikke opprettes. torlauncher.password_hash_missing=Kunne ikke hente kryptert passord. torlauncher.failed_to_get_settings=Kunne ikke hente Tor-innstillinger.\n\n%S

1 0