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

[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

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

20 Mar '16

commit b0d2cc471210627222f29acdf0878e96ee8e1d28 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:45:44 2016 +0000 Update translations for tor-launcher-properties --- nb/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties index e50f8b6..7accfd1 100644 --- a/nb/torlauncher.properties +++ b/nb/torlauncher.properties @@ -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=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=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

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit e55ad7885a6ce27170fbb0ae60661513229a754a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:45:40 2016 +0000 Update translations for mat-gui_completed --- nb.po | 134 +++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/nb.po b/nb.po index d11d69a..23c4398 100644 --- a/nb.po +++ b/nb.po @@ -4,13 +4,13 @@ # # Translators: # lateralus, 2013-2014 -# tyler moss <rsa(a)tutanota.de>, 2015 +# tyler moss <rsa(a)tutanota.de>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 15:03+0100\n" -"PO-Revision-Date: 2015-12-18 00:31+0000\n" +"POT-Creation-Date: 2016-02-10 23:06+0100\n" +"PO-Revision-Date: 2016-03-20 15:22+0000\n" "Last-Translator: tyler moss <rsa(a)tutanota.de>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -19,171 +19,171 @@ msgstr "" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:64 mat-gui:415 mat-gui:438 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Klar" -#: mat-gui:133 +#: mat-gui:136 msgid "Choose files" msgstr "Velg filer" -#: mat-gui:141 -msgid "All files" -msgstr "Alle filer" - -#: mat-gui:147 +#: mat-gui:144 msgid "Supported files" msgstr "Støttede filer" -#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436 -#: data/mat.glade:480 +#: mat-gui:151 +msgid "All files" +msgstr "Alle filer" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Rens" -#: mat-gui:165 +#: mat-gui:168 msgid "No metadata found" msgstr "Ingen metadata funnet" -#: mat-gui:167 mat-gui:412 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Ikke ren" -#: mat-gui:172 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%ss metadata" -#: mat-gui:183 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Makuler din meta, behold din data" -#: mat-gui:188 +#: mat-gui:192 msgid "Website" msgstr "Nettside" -#: mat-gui:214 +#: mat-gui:219 msgid "Preferences" msgstr "Innstillinger" -#: mat-gui:227 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "Reduser PDF kvalitet" -#: mat-gui:230 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Reduser den produserte PDFens størrelse og kvalitet" -#: mat-gui:233 -msgid "Add unsupported file to archives" -msgstr "Legg til ikke-støttet fil til arkivene" +#: mat-gui:238 +msgid "Remove unsupported file from archives" +msgstr "Fjern ikke støttet fil fra arkiv" -#: mat-gui:236 -msgid "Add non-supported (and so non-anonymised) file to output archive" -msgstr "Legg til ikke-støttet (og derfor ikke anonymisert) fil til outputarkiv" +#: mat-gui:241 +msgid "Remove non-supported (and so non-anonymised) file from output archive" +msgstr "Fjern ikke støttet (og så ikke-anonymisert) fil fra utgang arkiv" -#: mat-gui:275 +#: mat-gui:280 msgid "Unknown" msgstr "Ukjent" -#: mat-gui:318 +#: mat-gui:325 msgid "Not-supported" msgstr "Ikke-støttet" -#: mat-gui:332 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Harmløst filformat" -#: mat-gui:334 +#: mat-gui:341 msgid "Cant read file" msgstr "Kan ikke lese fil" -#: mat-gui:336 +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Filformatet støttes ikke" -#: mat-gui:339 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Disse filene kan ikke behandles:" -#: mat-gui:344 mat-gui:373 data/mat.glade:519 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Filnavn" -#: mat-gui:346 +#: mat-gui:353 msgid "Reason" msgstr "Årsak" -#: mat-gui:358 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Ikke-støttede filer i arkivet" -#: mat-gui:372 +#: mat-gui:379 msgid "Include" msgstr "Inkluder" -#: mat-gui:390 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT kunne ikke rengjøre følgende filer fra arkivet %s" -#: mat-gui:406 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "Sjekker %s" -#: mat-gui:421 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "Rengjør %s" -#: data/mat.glade:26 data/mat.glade:196 +#: data/mat.glade:46 +msgid "_File" +msgstr "_Arkiv" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "_Rediger" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "_Hjelp" + +#: data/mat.glade:187 +msgid "Add" +msgstr "Legg til" + +#: data/mat.glade:256 +msgid "State" +msgstr "Tilstand" + +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metadata" -#: data/mat.glade:85 +#: data/mat.glade:354 msgid "Name" msgstr "Navn" -#: data/mat.glade:99 +#: data/mat.glade:368 msgid "Content" msgstr "Innhold" -#: data/mat.glade:129 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Støttede format" -#: data/mat.glade:185 +#: data/mat.glade:456 msgid "Support" msgstr "Støtte" -#: data/mat.glade:207 +#: data/mat.glade:478 msgid "Method" msgstr "Metode" -#: data/mat.glade:218 +#: data/mat.glade:489 msgid "Remaining" msgstr "Gjenstår" -#: data/mat.glade:247 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Filformat" - -#: data/mat.glade:326 -msgid "_File" -msgstr "_Arkiv" - -#: data/mat.glade:375 -msgid "_Edit" -msgstr "_Rediger" - -#: data/mat.glade:421 -msgid "_Help" -msgstr "_Hjelp" - -#: data/mat.glade:467 -msgid "Add" -msgstr "Legg til" - -#: data/mat.glade:536 -msgid "State" -msgstr "Tilstand"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit f220469860aa1974f1029c6c1157989ca277f753 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:45:36 2016 +0000 Update translations for mat-gui --- nb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nb.po b/nb.po index 0af597c..23c4398 100644 --- a/nb.po +++ b/nb.po @@ -4,14 +4,14 @@ # # Translators: # lateralus, 2013-2014 -# tyler moss <rsa(a)tutanota.de>, 2015 +# tyler moss <rsa(a)tutanota.de>, 2015-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2016-02-11 09:31+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-03-20 15:22+0000\n" +"Last-Translator: tyler moss <rsa(a)tutanota.de>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,11 +75,11 @@ msgstr "Reduser den produserte PDFens størrelse og kvalitet" #: mat-gui:238 msgid "Remove unsupported file from archives" -msgstr "" +msgstr "Fjern ikke støttet fil fra arkiv" #: mat-gui:241 msgid "Remove non-supported (and so non-anonymised) file from output archive" -msgstr "" +msgstr "Fjern ikke støttet (og så ikke-anonymisert) fil fra utgang arkiv" #: mat-gui:280 msgid "Unknown"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 20 Mar '16

20 Mar '16

commit 7fa31a49895d32131019eb6f6c9b30d3eac27181 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 20 15:45:21 2016 +0000 Update translations for https_everywhere_completed --- nb/https-everywhere.dtd | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index 1016b1e..72da511 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -14,6 +14,7 @@ <!ENTITY https-everywhere.about.or "eller"> <!ENTITY https-everywhere.about.donate_eff "Donére til EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Donére til EFF"> <!ENTITY https-everywhere.menu.about "Om HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Innstillinger"> <!ENTITY https-everywhere.menu.globalEnable "Aktiver HTTPS Everywhere"> @@ -41,3 +42,15 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte forbindelser til disse nettstedene:"> <!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentelle regler"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Kan føre til advarsler eller brekkasje. Deaktivert som standard."> +<!ENTITY https-everywhere.chrome.add_rule "Legg til en regel for dette nettstedet"> +<!ENTITY https-everywhere.chrome.add_new_rule "Legg til en ny regel for dette nettstedet"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Bruk alltid https for denne verten"> +<!ENTITY https-everywhere.chrome.host "Vert:"> +<!ENTITY https-everywhere.chrome.show_advanced "Vis avanserte"> +<!ENTITY https-everywhere.chrome.hide_advanced "Skjul avanserte"> +<!ENTITY https-everywhere.chrome.rule_name "Regel navn"> +<!ENTITY https-everywhere.chrome.regex "Samsvarende regex"> +<!ENTITY https-everywhere.chrome.redirect_to "Omdiriger til"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Avbryt"> + +

1 0