January 2017 - tor-commits - lists.torproject.org

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit 06509d6b273cd35d34a952d5b9cd6ebdbeba0646 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 19 08:16:27 2017 +0000 Update translations for abouttor-homepage_completed --- da/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index 153193d..6b77534 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -26,13 +26,13 @@ <!ENTITY aboutTor.torInfo3.label "Udgangsknudepunkt:"> <!ENTITY aboutTor.torInfo4.label "Denne server logger ikke nogle informationer om besøgende."> <!ENTITY aboutTor.whatnextQuestion.label "Hvad er næste skridt?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. De bliver muligvis også nødt til at ændre browsing vaner for at sikre, at din identitet forbliver sikker"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. Du bliver muligvis også nødt til at ændre browsing vaner for at sikre, at din identitet forbliver sikker"> <!ENTITY aboutTor.whatnext.label "Tips for at forblive anonym"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser brugermanual »"> <!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Du kan hjælpe!"> -<!ENTITY aboutTor.helpInfo2.label "Der er mange måder De kan hjælpe for at gøre Tor-netværket hurtigere og stærkere:"> +<!ENTITY aboutTor.helpInfo2.label "Der er mange måder hvorpå du kan hjælpe for at gøre Tor-netværket hurtigere og stærkere:"> <!ENTITY aboutTor.helpInfo3.label "Kør et Tor-relæknudepunkt »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Tilbyd din hjælp »">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit 947c3bc04d49c8baa05116f24d4cc52d465e918c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 19 08:16:23 2017 +0000 Update translations for abouttor-homepage --- da/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/aboutTor.dtd b/da/aboutTor.dtd index 153193d..6b77534 100644 --- a/da/aboutTor.dtd +++ b/da/aboutTor.dtd @@ -26,13 +26,13 @@ <!ENTITY aboutTor.torInfo3.label "Udgangsknudepunkt:"> <!ENTITY aboutTor.torInfo4.label "Denne server logger ikke nogle informationer om besøgende."> <!ENTITY aboutTor.whatnextQuestion.label "Hvad er næste skridt?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. De bliver muligvis også nødt til at ændre browsing vaner for at sikre, at din identitet forbliver sikker"> +<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. Du bliver muligvis også nødt til at ændre browsing vaner for at sikre, at din identitet forbliver sikker"> <!ENTITY aboutTor.whatnext.label "Tips for at forblive anonym"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser brugermanual »"> <!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> <!ENTITY aboutTor.helpInfo1.label "Du kan hjælpe!"> -<!ENTITY aboutTor.helpInfo2.label "Der er mange måder De kan hjælpe for at gøre Tor-netværket hurtigere og stærkere:"> +<!ENTITY aboutTor.helpInfo2.label "Der er mange måder hvorpå du kan hjælpe for at gøre Tor-netværket hurtigere og stærkere:"> <!ENTITY aboutTor.helpInfo3.label "Kør et Tor-relæknudepunkt »"> <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Tilbyd din hjælp »">

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit 30a934b0092b779fd29c66a25078d75fc3753881 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 19 08:15:39 2017 +0000 Update translations for tails-persistence-setup_completed --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index c210aa2..0e9ceeb 100644 --- a/da/da.po +++ b/da/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2017-01-18 18:08+0000\n" +"PO-Revision-Date: 2017-01-19 08:09+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -198,7 +198,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "Alle ændringer foretaget vil kun blive anvendt efter Tails er genstartet.\n\nDe kan nu lukket dette program." +msgstr "Alle ændringer foretaget vil kun blive anvendt efter Tails er genstartet.\n\nDu kan nu lukket dette program." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit 186f4daba8e976257f0ed8371823be39338a3dd9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 19 08:15:36 2017 +0000 Update translations for tails-persistence-setup --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index c210aa2..0e9ceeb 100644 --- a/da/da.po +++ b/da/da.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-05-25 02:27+0200\n" -"PO-Revision-Date: 2017-01-18 18:08+0000\n" +"PO-Revision-Date: 2017-01-19 08:09+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -198,7 +198,7 @@ msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "Alle ændringer foretaget vil kun blive anvendt efter Tails er genstartet.\n\nDe kan nu lukket dette program." +msgstr "Alle ændringer foretaget vil kun blive anvendt efter Tails er genstartet.\n\nDu kan nu lukket dette program." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit 46f41ab3f9d69afb712f745eef916ec8c740fdcc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 19 08:15:18 2017 +0000 Update translations for whisperback_completed --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index 08809e9..e1c2a0c 100644 --- a/da/da.po +++ b/da/da.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2017-01-18 19:07+0000\n" +"PO-Revision-Date: 2017-01-19 08:07+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -82,7 +82,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 "\n\nFejl rapporten kunne ikke sende, sandsynligvis på grund af netværks problemer. Prøv venligst at genoprette forbindelsen til netværket og tryk \"Send Igen\".\n\nHvis det ikke virker, vil De få mulighed for at gemme fejl rapporten." +msgstr "\n\nFejl rapporten kunne ikke sende, sandsynligvis på grund af netværks problemer. Prøv venligst at genoprette forbindelsen til netværket og tryk \"Send Igen\".\n\nHvis det ikke virker, vil du få mulighed for at gemme fejl rapporten." #: ../whisperBack/gui.py:269 msgid "Your message has been sent."

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit db04fcd2d667b434a7c87990bbb85668dbbbb7a4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 19 08:15:14 2017 +0000 Update translations for whisperback --- da/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/da.po b/da/da.po index 08809e9..e1c2a0c 100644 --- a/da/da.po +++ b/da/da.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-12-16 19:54+0100\n" -"PO-Revision-Date: 2017-01-18 19:07+0000\n" +"PO-Revision-Date: 2017-01-19 08:07+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -82,7 +82,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 "\n\nFejl rapporten kunne ikke sende, sandsynligvis på grund af netværks problemer. Prøv venligst at genoprette forbindelsen til netværket og tryk \"Send Igen\".\n\nHvis det ikke virker, vil De få mulighed for at gemme fejl rapporten." +msgstr "\n\nFejl rapporten kunne ikke sende, sandsynligvis på grund af netværks problemer. Prøv venligst at genoprette forbindelsen til netværket og tryk \"Send Igen\".\n\nHvis det ikke virker, vil du få mulighed for at gemme fejl rapporten." #: ../whisperBack/gui.py:269 msgid "Your message has been sent."

1 0

[snowflake/master] Remove support for the base64 WebSocket subprotocol.
by dcf＠torproject.org 19 Jan '17

19 Jan '17

commit 15963688c202df4d0c81a27bccdaefcfe22b5963 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jan 18 20:00:59 2017 -0800 Remove support for the base64 WebSocket subprotocol. This was only needed for very very old Firefox before WebSockets were properly standardized. --- server/server.go | 49 +++++++++---------------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-) diff --git a/server/server.go b/server/server.go index 5002e4e..5e63b7e 100644 --- a/server/server.go +++ b/server/server.go @@ -10,7 +10,6 @@ package main import ( "crypto/tls" - "encoding/base64" "errors" "flag" "fmt" @@ -31,8 +30,7 @@ import ( const ptMethodName = "snowflake" const requestTimeout = 10 * time.Second -// "4/3+1" accounts for possible base64 encoding. -const maxMessageSize = 64*1024*4/3 + 1 +const maxMessageSize = 64*1024 var ptInfo pt.ServerInfo @@ -50,11 +48,9 @@ func usage() { } // An abstraction that makes an underlying WebSocket connection look like an -// io.ReadWriteCloser. It internally takes care of things like base64 encoding -// and decoding. +// io.ReadWriteCloser. type webSocketConn struct { Ws *websocket.WebSocket - Base64 bool messageBuf []byte } @@ -70,25 +66,11 @@ func (conn *webSocketConn) Read(b []byte) (n int, err error) { err = io.EOF return } - if conn.Base64 { - if m.Opcode != 1 { - err = errors.New(fmt.Sprintf("got non-text opcode %d with the base64 subprotocol", m.Opcode)) - return - } - conn.messageBuf = make([]byte, base64.StdEncoding.DecodedLen(len(m.Payload))) - var num int - num, err = base64.StdEncoding.Decode(conn.messageBuf, m.Payload) - if err != nil { - return - } - conn.messageBuf = conn.messageBuf[:num] - } else { - if m.Opcode != 2 { - err = errors.New(fmt.Sprintf("got non-binary opcode %d with no subprotocol", m.Opcode)) - return - } - conn.messageBuf = m.Payload + if m.Opcode != 2 { + err = errors.New(fmt.Sprintf("got non-binary opcode %d", m.Opcode)) + return } + conn.messageBuf = m.Payload } n = copy(b, conn.messageBuf) @@ -98,20 +80,9 @@ func (conn *webSocketConn) Read(b []byte) (n int, err error) { } // Implements io.Writer. -func (conn *webSocketConn) Write(b []byte) (n int, err error) { - if conn.Base64 { - buf := make([]byte, base64.StdEncoding.EncodedLen(len(b))) - base64.StdEncoding.Encode(buf, b) - err = conn.Ws.WriteMessage(1, buf) - if err != nil { - return - } - n = len(b) - } else { - err = conn.Ws.WriteMessage(2, b) - n = len(b) - } - return +func (conn *webSocketConn) Write(b []byte) (int, error) { + err := conn.Ws.WriteMessage(2, b) + return len(b), err } // Implements io.Closer. @@ -125,7 +96,6 @@ func (conn *webSocketConn) Close() error { func newWebSocketConn(ws *websocket.WebSocket) webSocketConn { var conn webSocketConn conn.Ws = ws - conn.Base64 = (ws.Subprotocol == "base64") return conn } @@ -233,7 +203,6 @@ func startServer(ln net.Listener) (net.Listener, error) { go func() { defer ln.Close() var config websocket.Config - config.Subprotocols = []string{"base64"} config.MaxMessageSize = maxMessageSize s := &http.Server{ Handler: config.Handler(webSocketHandler),

1 0

[snowflake/master] Remove the --port option from WebSocket server.
by dcf＠torproject.org 19 Jan '17

19 Jan '17

commit 3e7825171539708927c4f12f3bb9c22a8e4fd1a9 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jan 18 19:33:07 2017 -0800 Remove the --port option from WebSocket server. Recommend ServerTransportListenAddr in torrc instead. --- server/server.go | 12 ++---------- server/torrc | 3 ++- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/server/server.go b/server/server.go index 570de61..5002e4e 100644 --- a/server/server.go +++ b/server/server.go @@ -4,7 +4,8 @@ // // Usage in torrc: // ExtORPort auto -// ServerTransportPlugin snowflake exec server --port 9902 +// ServerTransportListenAddr snowflake 0.0.0.0:9902 +// ServerTransportPlugin snowflake exec server package main import ( @@ -250,14 +251,12 @@ func main() { var disableTLS bool var certFilename, keyFilename string var logFilename string - var port int flag.Usage = usage flag.BoolVar(&disableTLS, "disable-tls", false, "don't use HTTPS") flag.StringVar(&certFilename, "cert", "", "TLS certificate file (required without --disable-tls)") flag.StringVar(&keyFilename, "key", "", "TLS private key file (required without --disable-tls)") flag.StringVar(&logFilename, "log", "", "log file to write to") - flag.IntVar(&port, "port", 0, "port to listen on if unspecified by Tor") flag.Parse() if logFilename != "" { @@ -290,13 +289,6 @@ func main() { listeners := make([]net.Listener, 0) for _, bindaddr := range ptInfo.Bindaddrs { - // Override tor's requested port (which is 0 if this transport - // has not been run before) with the one requested by the --port - // option. - if port != 0 { - bindaddr.Addr.Port = port - } - switch bindaddr.MethodName { case ptMethodName: var ln net.Listener diff --git a/server/torrc b/server/torrc index 5cb891d..74f6af0 100644 --- a/server/torrc +++ b/server/torrc @@ -5,4 +5,5 @@ SocksPort 0 ExitPolicy reject *:* DataDirectory datadir -ServerTransportPlugin snowflake exec ./server --disable-tls --log snowflake.log --port 9902 +ServerTransportListenAddr snowflake 0.0.0.0:9902 +ServerTransportPlugin snowflake exec ./server --disable-tls --log snowflake.log

1 0

[snowflake/master] Remove unused logFile variable.
by dcf＠torproject.org 19 Jan '17

19 Jan '17

commit 57f72ab4ff5ea98866bf423a17c704a8c534e302 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jan 18 19:20:30 2017 -0800 Remove unused logFile variable. --- server/server.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/server.go b/server/server.go index 672c79e..b5417b5 100644 --- a/server/server.go +++ b/server/server.go @@ -33,8 +33,6 @@ const requestTimeout = 10 * time.Second // "4/3+1" accounts for possible base64 encoding. const maxMessageSize = 64*1024*4/3 + 1 -var logFile = os.Stderr - var ptInfo pt.ServerInfo // When a connection handler starts, +1 is written to this channel; when it

1 0

[snowflake/master] Simplify signal handling in WebSocket server.
by dcf＠torproject.org 19 Jan '17

19 Jan '17

commit 2a9126a1581a9e2bf5c8fbcd6992cfe57d8df831 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jan 18 19:24:02 2017 -0800 Simplify signal handling in WebSocket server. pt-spec no longer talks about SIGINT. --- server/server.go | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/server/server.go b/server/server.go index b5417b5..570de61 100644 --- a/server/server.go +++ b/server/server.go @@ -320,9 +320,9 @@ func main() { var numHandlers int = 0 var sig os.Signal sigChan := make(chan os.Signal, 1) - signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM) + signal.Notify(sigChan, syscall.SIGTERM) - // wait for first signal + // keep track of handlers and wait for a signal sig = nil for sig == nil { select { @@ -331,27 +331,16 @@ func main() { case sig = <-sigChan: } } - log.Printf("Got first signal %q with %d running handlers.", sig, numHandlers) + + // signal received, shut down + log.Printf("Caught signal %q, exiting.", sig) for _, ln := range listeners { ln.Close() } - - if sig == syscall.SIGTERM { - log.Printf("Caught signal %q, exiting.", sig) - return - } - - // wait for second signal or no more handlers - sig = nil - for sig == nil && numHandlers != 0 { - select { - case n := <-handlerChan: - numHandlers += n - log.Printf("%d remaining handlers.", numHandlers) - case sig = <-sigChan: + for n := range handlerChan { + numHandlers += n + if numHandlers == 0 { + break } } - if sig != nil { - log.Printf("Got second signal %q with %d running handlers.", sig, numHandlers) - } }

1 0