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

[atlas/master] Adds missing equals sign in router template (#21166)
by irl＠torproject.org 20 Jan '17

20 Jan '17

commit 73928cb9512c852b9eb5b4814655467782c99d8c Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Fri Jan 20 18:42:55 2017 +0000 Adds missing equals sign in router template (#21166) --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index 50d0ccc..907f17d 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -90,7 +90,7 @@ <dt>Last Restarted</dt> <dd><%= relay.get('last_restarted') %></dd> - <dt>Family Members</dt> + <dt>Family Members</dt> <dd><pre><% if (relay.get('effective_family') !== null) { %><% _.each(relay.get('effective_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %> <% if (valid) { %><a href="#details/<%= member.replace('$', '') %>" title="Effective family member"><% } %><%= member %><% if (valid) { %></a><% }}); %><% } %> <% if (relay.get('alleged_family') !== null) { %><% _.each(relay.get('alleged_family'), function(member) { %><% var valid = member.match(RegExp("^\$[A-F0-9]{40}$")); %>

1 0

[atlas/master] Fixed a bug where Atlas was not showing error messages properly
by irl＠torproject.org 20 Jan '17

20 Jan '17

commit feda6d99aa4ab961a2f2a2fa12cacdd57c579460 Author: Raphael Bergmann <raphael(a)cc-ltd.net> Date: Fri Jan 20 11:53:52 2017 +0100 Fixed a bug where Atlas was not showing error messages properly --- js/router.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/router.js b/js/router.js index 50bcd4e..1253405 100644 --- a/js/router.js +++ b/js/router.js @@ -107,7 +107,8 @@ define([ error: function(erno){ $("#content").show(); - doSearchView.error(erno); + doSearchView.error = erno; + doSearchView.renderError(); $("#loading").hide(); } });

1 0

[snowflake/master] Use log.Fatalf instead of log.Printf + os.Exit in server.
by dcf＠torproject.org 20 Jan '17

20 Jan '17

commit 21e27d3b3c02fb6153d7e75c8da046dd6e647063 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jan 20 09:30:00 2017 -0800 Use log.Fatalf instead of log.Printf + os.Exit in server. --- server/server.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/server/server.go b/server/server.go index 07b496c..b525569 100644 --- a/server/server.go +++ b/server/server.go @@ -228,11 +228,11 @@ func main() { flag.StringVar(&logFilename, "log", "", "log file to write to") flag.Parse() + log.SetFlags(log.LstdFlags | log.LUTC) if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { - fmt.Fprintf(os.Stderr, "Can't open log file %q: %s.\n", logFilename, err.Error()) - os.Exit(1) + log.Fatalf("Can't open log file %q: %s.", logFilename, err.Error()) } log.SetOutput(f) } @@ -247,13 +247,11 @@ func main() { } } - log.SetFlags(log.LstdFlags | log.LUTC) log.Printf("starting") var err error ptInfo, err = pt.ServerSetup(nil) if err != nil { - log.Printf("error in setup: %s", err) - os.Exit(1) + log.Fatalf("error in setup: %s", err) } listeners := make([]net.Listener, 0)

1 0

[snowflake/master] Make log messages more uniform.
by dcf＠torproject.org 20 Jan '17

20 Jan '17

commit aa204af6b18936cdf291d51c57656dc927b3f5de Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jan 20 09:41:24 2017 -0800 Make log messages more uniform. --- server/server.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/server.go b/server/server.go index b525569..f29490c 100644 --- a/server/server.go +++ b/server/server.go @@ -142,7 +142,7 @@ func webSocketHandler(ws *websocket.WebSocket) { // the client. See https://bugs.torproject.org/18628. or, err := pt.DialOr(&ptInfo, "", ptMethodName) if err != nil { - log.Printf("Failed to connect to ORPort: " + err.Error()) + log.Printf("failed to connect to ORPort: %s", err) return } defer or.Close() @@ -210,7 +210,7 @@ func startServer(ln net.Listener) (net.Listener, error) { } err := s.Serve(ln) if err != nil { - log.Printf("http.Serve: " + err.Error()) + log.Printf("http.Serve: %s", err) } }() return ln, nil @@ -232,18 +232,18 @@ func main() { if logFilename != "" { f, err := os.OpenFile(logFilename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600) if err != nil { - log.Fatalf("Can't open log file %q: %s.", logFilename, err.Error()) + log.Fatalf("can't open log file: %s", err) } log.SetOutput(f) } if disableTLS { if certFilename != "" || keyFilename != "" { - log.Fatalf("The --cert and --key options are not allowed with --disable-tls.\n") + log.Fatalf("the --cert and --key options are not allowed with --disable-tls") } } else { if certFilename == "" || keyFilename == "" { - log.Fatalf("The --cert and --key options are required.\n") + log.Fatalf("the --cert and --key options are required") } } @@ -292,7 +292,7 @@ func main() { } // signal received, shut down - log.Printf("Caught signal %q, exiting.", sig) + log.Printf("caught signal %q, exiting", sig) for _, ln := range listeners { ln.Close() }

1 0

[snowflake/master] Remove a level of indentation in server.
by dcf＠torproject.org 20 Jan '17

20 Jan '17

commit 8378f8595214449cc3fd1db44f5463b72d237836 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jan 20 10:19:25 2017 -0800 Remove a level of indentation in server. --- server/server.go | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/server/server.go b/server/server.go index b2876fa..9bfe9e9 100644 --- a/server/server.go +++ b/server/server.go @@ -256,26 +256,26 @@ func main() { listeners := make([]net.Listener, 0) for _, bindaddr := range ptInfo.Bindaddrs { - switch bindaddr.MethodName { - case ptMethodName: - var ln net.Listener - args := pt.Args{} - if disableTLS { - args.Add("tls", "no") - ln, err = startListener("tcp", bindaddr.Addr) - } else { - args.Add("tls", "yes") - ln, err = startListenerTLS("tcp", bindaddr.Addr, certFilename, keyFilename) - } - if err != nil { - pt.SmethodError(bindaddr.MethodName, err.Error()) - break - } - pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args) - listeners = append(listeners, ln) - default: + if bindaddr.MethodName != ptMethodName { pt.SmethodError(bindaddr.MethodName, "no such method") + continue } + + var ln net.Listener + args := pt.Args{} + if disableTLS { + args.Add("tls", "no") + ln, err = startListener("tcp", bindaddr.Addr) + } else { + args.Add("tls", "yes") + ln, err = startListenerTLS("tcp", bindaddr.Addr, certFilename, keyFilename) + } + if err != nil { + pt.SmethodError(bindaddr.MethodName, err.Error()) + break + } + pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args) + listeners = append(listeners, ln) } pt.SmethodsDone()

1 0

[snowflake/master] Include "tls=no" or "tls=yes" in the bridge descriptor.
by dcf＠torproject.org 20 Jan '17

20 Jan '17

commit d8411816c457bc2412ffcc211413a56c5fa62dcc Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jan 20 10:13:39 2017 -0800 Include "tls=no" or "tls=yes" in the bridge descriptor. Might make this controlled by ServerTransportOptions instead of the --disable-tls command line option. --- server/server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index f29490c..b2876fa 100644 --- a/server/server.go +++ b/server/server.go @@ -259,16 +259,19 @@ func main() { switch bindaddr.MethodName { case ptMethodName: var ln net.Listener + args := pt.Args{} if disableTLS { + args.Add("tls", "no") ln, err = startListener("tcp", bindaddr.Addr) } else { + args.Add("tls", "yes") ln, err = startListenerTLS("tcp", bindaddr.Addr, certFilename, keyFilename) } if err != nil { pt.SmethodError(bindaddr.MethodName, err.Error()) break } - pt.Smethod(bindaddr.MethodName, ln.Addr()) + pt.SmethodArgs(bindaddr.MethodName, ln.Addr(), args) listeners = append(listeners, ln) default: pt.SmethodError(bindaddr.MethodName, "no such method")

1 0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation＠torproject.org 20 Jan '17

20 Jan '17

commit 60a1dde6ae8a84ab462961335cdbf266c5a1a69e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 20 14:18:42 2017 +0000 Update translations for tor-browser-manual_completed --- nb/nb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index bc43069..e9aa15e 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -253,11 +253,11 @@ msgid "" "available." msgstr "" "Direkte tilgang til Tor-nettverket kan noen ganger være blokkert av din " -"tjenestetilbyder for Internett eller av en myndighet. Tor-nettleseren " -"innehar noen av disse omgåelsesverktøyene for å komme rundt disse " -"blokkeringene. Disse verktøyene heter \"pluggbare transporter\". Se siden " -"for <link xref=\"transports\">Pluggbare transporter</link> for mer " -"informasjon om transporttypene som er tilgjengelige for tiden." +"tjenestetilbyder for Internett, eller av en myndighet. Tor-nettleseren har " +"noen omgåelsesverktøyene for å komme rundt disse blokkeringene. Disse " +"verktøyene heter \"pluggbare transporter\". Se siden for <link " +"xref=\"transports\">Pluggbare transporter</link> for mer informasjon om " +"transporttypene som er tilgjengelige for tiden." #: circumvention.page:22 msgid "Using pluggable transports" @@ -1564,7 +1564,7 @@ msgid "" "If Tor Browser doesn’t connect, there may be a simple solution. Try each of " "the following:" msgstr "" -"Hvis Tor.nettleseren ikke kan koble til, kan det ha sin årsak i noe enkelt. " +"Hvis Tor-nettleseren ikke kan koble til, kan det ha sin årsak i noe enkelt. " "Prøv hver av følgende:" #: troubleshooting.page:29

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 20 Jan '17

20 Jan '17

commit 62b7f26b66947519a5046036b31c5ce18980a7b1 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 20 14:18:37 2017 +0000 Update translations for tor-browser-manual --- nb/nb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nb/nb.po b/nb/nb.po index bc43069..e9aa15e 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -253,11 +253,11 @@ msgid "" "available." msgstr "" "Direkte tilgang til Tor-nettverket kan noen ganger være blokkert av din " -"tjenestetilbyder for Internett eller av en myndighet. Tor-nettleseren " -"innehar noen av disse omgåelsesverktøyene for å komme rundt disse " -"blokkeringene. Disse verktøyene heter \"pluggbare transporter\". Se siden " -"for <link xref=\"transports\">Pluggbare transporter</link> for mer " -"informasjon om transporttypene som er tilgjengelige for tiden." +"tjenestetilbyder for Internett, eller av en myndighet. Tor-nettleseren har " +"noen omgåelsesverktøyene for å komme rundt disse blokkeringene. Disse " +"verktøyene heter \"pluggbare transporter\". Se siden for <link " +"xref=\"transports\">Pluggbare transporter</link> for mer informasjon om " +"transporttypene som er tilgjengelige for tiden." #: circumvention.page:22 msgid "Using pluggable transports" @@ -1564,7 +1564,7 @@ msgid "" "If Tor Browser doesn’t connect, there may be a simple solution. Try each of " "the following:" msgstr "" -"Hvis Tor.nettleseren ikke kan koble til, kan det ha sin årsak i noe enkelt. " +"Hvis Tor-nettleseren ikke kan koble til, kan det ha sin årsak i noe enkelt. " "Prøv hver av følgende:" #: troubleshooting.page:29

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 20 Jan '17

20 Jan '17

commit 9785d56a792e2770a3f021621fe65043e3a6b0ea Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 20 14:16:53 2017 +0000 Update translations for torbutton-torbuttondtd --- nb/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd index 6e955eb..8061059 100644 --- a/nb/torbutton.dtd +++ b/nb/torbutton.dtd @@ -6,7 +6,7 @@ <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for Tor…"> <!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for Tor-nettleser…"> +<!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for Tor-nettleseren…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> <!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelse…"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> @@ -27,7 +27,7 @@ <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler"> <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata."> <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R"> -<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hold denne boksen sjekket for å forebygge ulike nettleserfunksjoner blir misbrukt til å spore deg når du surfer på nettet. Modifiserte funksjoner inkluderer blob webadresser, kringkasting kanaler, nettleserens cache, cookies, favicon, HTTP Autentiserings overskrifter, link preconnects, localstorage , Mediasource webadresser, OCSP forespørsler, SharedWorkers og TLS øktbilletter."> +<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hold denne boksen avhuket for å forebygge at ulike nettleserfunksjoner blir misbrukt til å spore deg når du surfer på nettet. Modifiserte funksjoner inkluderer blob-nettadresser, kringkastinskanaler, nettleserens mellomlager, informasjonskapsler, favicon, HTTP-autentiserings overskrifter, link preconnects, localstorage , Mediasource-nettadresser, OCSP-forespørsler, SharedWorkers og TLS øktbilletter."> <!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren."> <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F"> <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hold denne boksen sjekket for å skjule ting fra nettsteder som kan være unikt med deg, inkludert batteristatus, datamaskinens ytelse, tastaturoppsett , lokalitet, plasseringen av installerte plugins, listen over installerte plugins, nettverksstatus, skjermretning , skjermstørrelse , stedsspesifikk zoomnivåer , filtyper som støttes, system farger og WebGL evner.">

1 0

[translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed
by translation＠torproject.org 20 Jan '17

20 Jan '17

commit 5169f097fb3bee7b2db3f3bad29b2943a7fc7f14 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 20 14:16:47 2017 +0000 Update translations for torbutton-branddtd_completed --- nb/brand.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb/brand.dtd b/nb/brand.dtd index 0316f09..7ae614c 100644 --- a/nb/brand.dtd +++ b/nb/brand.dtd @@ -2,9 +2,9 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY brandShorterName "Tor-nettleser"> -<!ENTITY brandShortName "Tor-nettleser"> -<!ENTITY brandFullName "Tor-nettleser"> +<!ENTITY brandShorterName "Tor-nettleseren"> +<!ENTITY brandShortName "Tor-nettleseren"> +<!ENTITY brandFullName "Tor-nettleseren"> <!ENTITY vendorShortName "Tor-prosjektet"> <!ENTITY trademarkInfo.part1 "Firefox og Firefox-logene er varemarker tilhørende Mozilla-stiftelsen.">

1 0