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

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

15 Jan '19

commit aab4b026963f8187afb7bc314d5292813fdd741e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 15 08:45:10 2019 +0000 Update translations for abouttor-homepage_completed --- ro/aboutTor.dtd | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/ro/aboutTor.dtd b/ro/aboutTor.dtd index 56b0c12db..2203ef5ee 100644 --- a/ro/aboutTor.dtd +++ b/ro/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Despre Tor"> -<!ENTITY aboutTor.ready.label "Explorează. Privat."> +<!ENTITY aboutTor.ready.label "Explorează. În mod privat."> <!ENTITY aboutTor.ready2.label "Ești gata pentru cel mai sigur mod de navigare din întreaga lume."> <!ENTITY aboutTor.failure.label "Ceva a mers prost!"> <!ENTITY aboutTor.failure2.label "Tor nu funcționează în acest browser."> @@ -26,3 +26,22 @@ <!ENTITY aboutTor.newsletter.tagline "Obțineți ultimele știri de la Tor direct în căsuța de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News."> + +<!ENTITY aboutTor.donationBanner.line1 "Tor: Putere în Numere"> + +<!ENTITY aboutTor.donationBanner.line2a "Anonimitatea iubește compania."> +<!ENTITY aboutTor.donationBanner.line2b "Avansează libertățile umane universale."> +<!ENTITY aboutTor.donationBanner.line2c "Susține libertatea."> +<!ENTITY aboutTor.donationBanner.line2d "Protejează intimitatea a milioanelor de oameni."> +<!ENTITY aboutTor.donationBanner.line2e "Menține Tor puternic."> +<!ENTITY aboutTor.donationBanner.line2f "Avem nevoie de susținerea ta!"> +<!ENTITY aboutTor.donationBanner.line2g "Apără libertatea Internetului."> +<!ENTITY aboutTor.donationBanner.line2h "Protejează Internetul deschis."> +<!ENTITY aboutTor.donationBanner.line2i "Susține libertatea si confidențialitatea online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla contribuie în mod egal pentru fiecare donație până in anul 2019."> + +<!ENTITY aboutTor.donationBanner.line3 "Donează azi, și Mozilla va dona în aceeași măsură."> +<!ENTITY aboutTor.donationBanner.line3b "Donează azi, și darul tău va fi de două ori mai puternic."> + +<!ENTITY aboutTor.donationBanner.buttonA "Donează Acum"> +<!ENTITY aboutTor.donationBanner.buttonB "Contează Pe Mine">

1 0

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

15 Jan '19

commit bee9fa0ed25dd5cbd30bdac21dbb852b42f20893 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 15 08:45:03 2019 +0000 Update translations for abouttor-homepage --- ro/aboutTor.dtd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ro/aboutTor.dtd b/ro/aboutTor.dtd index 4077167ee..2203ef5ee 100644 --- a/ro/aboutTor.dtd +++ b/ro/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Despre Tor"> -<!ENTITY aboutTor.ready.label "Explorează. Privat."> +<!ENTITY aboutTor.ready.label "Explorează. În mod privat."> <!ENTITY aboutTor.ready2.label "Ești gata pentru cel mai sigur mod de navigare din întreaga lume."> <!ENTITY aboutTor.failure.label "Ceva a mers prost!"> <!ENTITY aboutTor.failure2.label "Tor nu funcționează în acest browser."> @@ -27,21 +27,21 @@ <!ENTITY aboutTor.newsletter.tagline "Obțineți ultimele știri de la Tor direct în căsuța de e-mail."> <!ENTITY aboutTor.newsletter.link_text "Abonează-te la Tor News."> -<!ENTITY aboutTor.donationBanner.line1 "Tor: Strength in Numbers"> +<!ENTITY aboutTor.donationBanner.line1 "Tor: Putere în Numere"> -<!ENTITY aboutTor.donationBanner.line2a "Anonymity loves company."> -<!ENTITY aboutTor.donationBanner.line2b "Advance universal human rights."> -<!ENTITY aboutTor.donationBanner.line2c "Stand up for freedom."> -<!ENTITY aboutTor.donationBanner.line2d "Protect the privacy of millions."> -<!ENTITY aboutTor.donationBanner.line2e "Keep Tor strong."> -<!ENTITY aboutTor.donationBanner.line2f "We need your support!"> -<!ENTITY aboutTor.donationBanner.line2g "Support internet freedom."> -<!ENTITY aboutTor.donationBanner.line2h "Defend the open web."> -<!ENTITY aboutTor.donationBanner.line2i "Support privacy and freedom online."> -<!ENTITY aboutTor.donationBanner.line2j "Mozilla is matching every donation until 2019."> +<!ENTITY aboutTor.donationBanner.line2a "Anonimitatea iubește compania."> +<!ENTITY aboutTor.donationBanner.line2b "Avansează libertățile umane universale."> +<!ENTITY aboutTor.donationBanner.line2c "Susține libertatea."> +<!ENTITY aboutTor.donationBanner.line2d "Protejează intimitatea a milioanelor de oameni."> +<!ENTITY aboutTor.donationBanner.line2e "Menține Tor puternic."> +<!ENTITY aboutTor.donationBanner.line2f "Avem nevoie de susținerea ta!"> +<!ENTITY aboutTor.donationBanner.line2g "Apără libertatea Internetului."> +<!ENTITY aboutTor.donationBanner.line2h "Protejează Internetul deschis."> +<!ENTITY aboutTor.donationBanner.line2i "Susține libertatea si confidențialitatea online."> +<!ENTITY aboutTor.donationBanner.line2j "Mozilla contribuie în mod egal pentru fiecare donație până in anul 2019."> -<!ENTITY aboutTor.donationBanner.line3 "Give today, and Mozilla will match your donation."> -<!ENTITY aboutTor.donationBanner.line3b "Give now, and your gift becomes twice as strong."> +<!ENTITY aboutTor.donationBanner.line3 "Donează azi, și Mozilla va dona în aceeași măsură."> +<!ENTITY aboutTor.donationBanner.line3b "Donează azi, și darul tău va fi de două ori mai puternic."> -<!ENTITY aboutTor.donationBanner.buttonA "Donate Now"> -<!ENTITY aboutTor.donationBanner.buttonB "Count Me In"> +<!ENTITY aboutTor.donationBanner.buttonA "Donează Acum"> +<!ENTITY aboutTor.donationBanner.buttonB "Contează Pe Mine">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 15 Jan '19

15 Jan '19

commit 5f6eaf76e36028b9f6fc6c74d89f8fc951b43c88 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 15 08:19:02 2019 +0000 Update translations for tor-launcher-network-settings --- ro/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd index 73100efe4..b3a83b70f 100644 --- a/ro/network-settings.dtd +++ b/ro/network-settings.dtd @@ -36,7 +36,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Acest computer iese printr-un firewall care permite doar conexiuni către anumite porturi"> +<!ENTITY torsettings.firewall.checkbox "Acest computer trece printr-un firewall care permite doar conexiuni către anumite porturi"> <!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> <!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat în țara mea"> <!ENTITY torsettings.useBridges.default "Selectează o punte integrată"> @@ -45,7 +45,7 @@ <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Introdu caracterele din imagine"> <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> <!ENTITY torsettings.useBridges.captchaSubmit "Trimite"> -<!ENTITY torsettings.useBridges.custom "Furnizează o punte pe care o știu"> +<!ENTITY torsettings.useBridges.custom "Folosește o punte pe care o știu"> <!ENTITY torsettings.useBridges.label "Introdu informația despre punte dintr-o sursă de încredere"> <!ENTITY torsettings.useBridges.placeholder "scrie adresă:port (una pe linie)"> @@ -55,7 +55,7 @@ <!ENTITY torsettings.proxyHelp1 "Un proxy local ar putea fi necesar la conectarea prin rețeaua unei companii, școli sau universități. Dacă nu ești sigur că un proxy este necesar, vezi setările pentru Internet în alt navigator web sau verifică setările de rețea."> <!ENTITY torsettings.bridgeHelpTitle "Ajutor Releuri de tip Punte"> -<!ENTITY torsettings.bridgeHelp1 "Punțile sunt relee ne-listate care fac mai dificilă blocarea conexiunilor spre Rețeaua Tor.   Fiecare tip de punte folosește o altă metodă pentru a evita cenzura.   Cele obfs fac traficul tău să semene cu zgomot aleatoriu, iar cele meek fac traficul să pară că se conectează la acel serviciu în loc de Tor."> +<!ENTITY torsettings.bridgeHelp1 "Punțile sunt relee ne-listate care fac mai dificilă blocarea conexiunilor spre Rețeaua Tor.   Fiecare tip de punte folosește o altă metodă pentru a evita cenzura.   Cele de tip obfs fac traficul tău să semene cu zgomot aleatoriu, iar cele meek fac traficul să pară că se conectează la acel serviciu în loc de Tor."> <!ENTITY torsettings.bridgeHelp2 "Datorită modului în care diverse țări încearcă să blocheze Tor, unele punți funcționează doar în anumite țări și nu în altele.   Dacă nu ești sigur ce punți funcționează în țara ta, vizitează torproject.org/about/contact.html#support">

1 0

[meek/master] Refactor the helper into an http.RoundTripper.
by dcf＠torproject.org 15 Jan '19

15 Jan '19

commit 15108412e6d608ebaaadbf8df84f62a4da96afe7 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 14 22:52:14 2019 -0700 Refactor the helper into an http.RoundTripper. --- meek-client/helper.go | 82 ++++++++++++++++++++++++++++++++++++++-------- meek-client/meek-client.go | 23 ++++++++----- 2 files changed, 83 insertions(+), 22 deletions(-) diff --git a/meek-client/helper.go b/meek-client/helper.go index 6b89f5a..f412aaa 100644 --- a/meek-client/helper.go +++ b/meek-client/helper.go @@ -9,6 +9,7 @@ import ( "io/ioutil" "net" "net/http" + "net/textproto" "net/url" "strconv" "time" @@ -40,6 +41,11 @@ type ProxySpec struct { Port int `json:"port"` } +type HelperRoundTripper struct { + ReadTimeout time.Duration + WriteTimeout time.Duration +} + // Return a ProxySpec suitable for the proxy URL in u. func makeProxySpec(u *url.URL) (*ProxySpec, error) { spec := new(ProxySpec) @@ -80,9 +86,7 @@ func makeProxySpec(u *url.URL) (*ProxySpec, error) { return spec, nil } -// Do an HTTP roundtrip through the configured browser extension, using the -// payload data in buf and the request metadata in info. -func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { +func (rt *HelperRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { s, err := net.DialTCP("tcp", nil, options.HelperAddr) if err != nil { return nil, err @@ -90,28 +94,51 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) defer s.Close() // Encode our JSON. - req := JSONRequest{ - Method: "POST", - URL: info.URL.String(), + jsonReq := JSONRequest{ + Method: req.Method, + URL: req.URL.String(), Header: make(map[string]string), - Body: buf, + Body: make([]byte, 0), } - req.Header["X-Session-Id"] = info.SessionID - if info.Host != "" { - req.Header["Host"] = info.Host + + // We take only the first value for each header key, due to limitations + // in the helper JSON protocol. + for key, values := range req.Header { + if len(values) == 0 { + continue + } + value := values[0] + key = textproto.CanonicalMIMEHeaderKey(key) + jsonReq.Header[key] = value + } + // req.Host overrides req.Header. + if req.Host != "" { + jsonReq.Header["Host"] = req.Host } - req.Proxy, err = makeProxySpec(options.ProxyURL) + + if req.Body != nil { + jsonReq.Body, err = ioutil.ReadAll(req.Body) + if err != nil { + return nil, err + } + err = req.Body.Close() + if err != nil { + return nil, err + } + } + + jsonReq.Proxy, err = makeProxySpec(options.ProxyURL) if err != nil { return nil, err } - encReq, err := json.Marshal(&req) + encReq, err := json.Marshal(&jsonReq) if err != nil { return nil, err } // log.Printf("encoded %s", encReq) // Send the request. - s.SetWriteDeadline(time.Now().Add(helperWriteTimeout)) + s.SetWriteDeadline(time.Now().Add(rt.WriteTimeout)) err = binary.Write(s, binary.BigEndian, uint32(len(encReq))) if err != nil { return nil, err @@ -123,7 +150,7 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) // Read the response. var length uint32 - s.SetReadDeadline(time.Now().Add(helperReadTimeout)) + s.SetReadDeadline(time.Now().Add(rt.ReadTimeout)) err = binary.Read(s, binary.BigEndian, &length) if err != nil { return nil, err @@ -159,3 +186,30 @@ func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) } return &resp, nil } + +// Do an HTTP roundtrip through the configured browser extension, using the +// payload data in buf and the request metadata in info. +func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { + var body io.Reader + if len(buf) > 0 { + // Leave body == nil when buf is empty. A nil body is an + // explicit signal that the body is empty. An empty + // *bytes.Reader or the magic value http.NoBody are supposed to + // be equivalent ways to signal an empty body, but in Go 1.8 the + // HTTP/2 code only understands nil. Not leaving body == nil + // causes the Content-Length header to be omitted from HTTP/2 + // requests, which in some cases can cause the server to return + // a 411 "Length Required" error. See + // https://bugs.torproject.org/22865. + body = bytes.NewReader(buf) + } + req, err := http.NewRequest("POST", info.URL.String(), body) + if err != nil { + return nil, err + } + if info.Host != "" { + req.Host = info.Host + } + req.Header.Set("X-Session-Id", info.SessionID) + return helperRoundTripper.RoundTrip(req) +} diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index bbacbb4..3923b9a 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -83,10 +83,16 @@ const ( var ptInfo pt.ClientInfo -// We use this RoundTripper to make all our requests (when --helper is not -// used). We use the defaults, except we take control of the Proxy setting +// We use this RoundTripper to make all our requests when --helper is not +// in effect. We use the defaults, except we take control of the Proxy setting // (notably, disabling the default ProxyFromEnvironment). -var httpTransport *http.Transport = http.DefaultTransport.(*http.Transport) +var httpRoundTripper *http.Transport = http.DefaultTransport.(*http.Transport) + +// We use this RoundTripper when --helper is in effect. +var helperRoundTripper = &HelperRoundTripper{ + ReadTimeout: helperReadTimeout, + WriteTimeout: helperWriteTimeout, +} // Store for command line options. var options struct { @@ -137,7 +143,7 @@ func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { req.Host = info.Host } req.Header.Set("X-Session-Id", info.SessionID) - return httpTransport.RoundTrip(req) + return httpRoundTripper.RoundTrip(req) } // Do a roundtrip, trying at most limit times if there is an HTTP status other @@ -411,9 +417,10 @@ func main() { } } - // Disable the default ProxyFromEnvironment setting. httpTransport.Proxy - // is overridden below if options.ProxyURL is set. - httpTransport.Proxy = nil + // Disable the default ProxyFromEnvironment setting. + // httpRoundTripper.Proxy is overridden below if options.ProxyURL is + // set. + httpRoundTripper.Proxy = nil // Command-line proxy overrides managed configuration. if options.ProxyURL == nil { @@ -427,7 +434,7 @@ func main() { log.Fatal(fmt.Sprintf("proxy error: %s", err)) } log.Printf("using proxy %s", options.ProxyURL.String()) - httpTransport.Proxy = http.ProxyURL(options.ProxyURL) + httpRoundTripper.Proxy = http.ProxyURL(options.ProxyURL) if ptInfo.ProxyURL != nil { pt.ProxyDone() }

1 0

[meek/master] Deduplicate request creation across HTTP/helper.
by dcf＠torproject.org 15 Jan '19

15 Jan '19

commit da81c19ce576ceb0d290c6e935abe2f162e8ce28 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 14 23:02:34 2019 -0700 Deduplicate request creation across HTTP/helper. --- meek-client/helper.go | 27 --------------------------- meek-client/meek-client.go | 26 +++++++++++++++----------- 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/meek-client/helper.go b/meek-client/helper.go index f412aaa..eaaf302 100644 --- a/meek-client/helper.go +++ b/meek-client/helper.go @@ -186,30 +186,3 @@ func (rt *HelperRoundTripper) RoundTrip(req *http.Request) (*http.Response, erro } return &resp, nil } - -// Do an HTTP roundtrip through the configured browser extension, using the -// payload data in buf and the request metadata in info. -func roundTripWithHelper(buf []byte, info *RequestInfo) (*http.Response, error) { - var body io.Reader - if len(buf) > 0 { - // Leave body == nil when buf is empty. A nil body is an - // explicit signal that the body is empty. An empty - // *bytes.Reader or the magic value http.NoBody are supposed to - // be equivalent ways to signal an empty body, but in Go 1.8 the - // HTTP/2 code only understands nil. Not leaving body == nil - // causes the Content-Length header to be omitted from HTTP/2 - // requests, which in some cases can cause the server to return - // a 411 "Length Required" error. See - // https://bugs.torproject.org/22865. - body = bytes.NewReader(buf) - } - req, err := http.NewRequest("POST", info.URL.String(), body) - if err != nil { - return nil, err - } - if info.Host != "" { - req.Host = info.Host - } - req.Header.Set("X-Session-Id", info.SessionID) - return helperRoundTripper.RoundTrip(req) -} diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 3923b9a..fd16099 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -119,9 +119,9 @@ type RequestInfo struct { Host string } -// Do an HTTP roundtrip using the payload data in buf and the request metadata -// in info. -func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { +// Make an http.Request from the payload data in buf and the request metadata in +// info. +func makeRequest(buf []byte, info *RequestInfo) (*http.Request, error) { var body io.Reader if len(buf) > 0 { // Leave body == nil when buf is empty. A nil body is an @@ -143,7 +143,7 @@ func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { req.Host = info.Host } req.Header.Set("X-Session-Id", info.SessionID) - return httpRoundTripper.RoundTrip(req) + return req, nil } // Do a roundtrip, trying at most limit times if there is an HTTP status other @@ -154,16 +154,12 @@ func roundTripWithHTTP(buf []byte, info *RequestInfo) (*http.Response, error) { // which will cause the connection to die. The alternative, though, is to just // kill the connection immediately. A better solution would be a system of // acknowledgements so we know what to resend after an error. -func roundTripRetries(buf []byte, info *RequestInfo, limit int) (*http.Response, error) { - roundTrip := roundTripWithHTTP - if options.HelperAddr != nil { - roundTrip = roundTripWithHelper - } +func roundTripRetries(rt http.RoundTripper, req *http.Request, limit int) (*http.Response, error) { var resp *http.Response var err error again: limit-- - resp, err = roundTrip(buf, info) + resp, err = rt.RoundTrip(req) // Retry only if the HTTP roundtrip completed without error, but // returned a status other than 200. Other kinds of errors and success // with 200 always return immediately. @@ -181,7 +177,15 @@ again: // Send the data in buf to the remote URL, wait for a reply, and feed the reply // body back into conn. func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) { - resp, err := roundTripRetries(buf, info, maxTries) + var rt http.RoundTripper = httpRoundTripper + if options.HelperAddr != nil { + rt = helperRoundTripper + } + req, err := makeRequest(buf, info) + if err != nil { + return 0, err + } + resp, err := roundTripRetries(rt, req, maxTries) if err != nil { return 0, err }

1 0

[meek/master] Move address and proxy settings into HelperRoundTripper.
by dcf＠torproject.org 15 Jan '19

15 Jan '19

commit 3fe68658f433adb2b8bec215d4daf48e81003cf7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jan 15 00:37:31 2019 -0700 Move address and proxy settings into HelperRoundTripper. Copy them into an instance from the global settings, don't read the global settings directly. --- meek-client/helper.go | 15 ++++++++++----- meek-client/meek-client.go | 22 ++++++++++++++-------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/meek-client/helper.go b/meek-client/helper.go index eaaf302..a003bf7 100644 --- a/meek-client/helper.go +++ b/meek-client/helper.go @@ -42,8 +42,16 @@ type ProxySpec struct { } type HelperRoundTripper struct { + HelperAddr *net.TCPAddr ReadTimeout time.Duration WriteTimeout time.Duration + proxySpec *ProxySpec +} + +func (rt *HelperRoundTripper) SetProxy(u *url.URL) error { + var err error + rt.proxySpec, err = makeProxySpec(u) + return err } // Return a ProxySpec suitable for the proxy URL in u. @@ -87,7 +95,7 @@ func makeProxySpec(u *url.URL) (*ProxySpec, error) { } func (rt *HelperRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) { - s, err := net.DialTCP("tcp", nil, options.HelperAddr) + s, err := net.DialTCP("tcp", nil, rt.HelperAddr) if err != nil { return nil, err } @@ -127,10 +135,7 @@ func (rt *HelperRoundTripper) RoundTrip(req *http.Request) (*http.Response, erro } } - jsonReq.Proxy, err = makeProxySpec(options.ProxyURL) - if err != nil { - return nil, err - } + jsonReq.Proxy = rt.proxySpec encReq, err := json.Marshal(&jsonReq) if err != nil { return nil, err diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index fd16099..9c715a3 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -96,10 +96,10 @@ var helperRoundTripper = &HelperRoundTripper{ // Store for command line options. var options struct { - URL string - Front string - ProxyURL *url.URL - HelperAddr *net.TCPAddr + URL string + Front string + ProxyURL *url.URL + UseHelper bool } // When a connection handler starts, +1 is written to this channel; when it @@ -178,7 +178,7 @@ again: // body back into conn. func sendRecv(buf []byte, conn net.Conn, info *RequestInfo) (int64, error) { var rt http.RoundTripper = httpRoundTripper - if options.HelperAddr != nil { + if options.UseHelper { rt = helperRoundTripper } req, err := makeRequest(buf, info) @@ -346,7 +346,7 @@ func acceptLoop(ln *pt.SocksListener) error { // Return an error if this proxy URL doesn't work with the rest of the // configuration. func checkProxyURL(u *url.URL) error { - if options.HelperAddr == nil { + if !options.UseHelper { // Without the helper we only support HTTP proxies. if u.Scheme != "http" { return fmt.Errorf("don't understand proxy URL scheme %q", u.Scheme) @@ -407,11 +407,12 @@ func main() { } if helperAddr != "" { - options.HelperAddr, err = net.ResolveTCPAddr("tcp", helperAddr) + options.UseHelper = true + helperRoundTripper.HelperAddr, err = net.ResolveTCPAddr("tcp", helperAddr) if err != nil { log.Fatalf("can't resolve helper address: %s", err) } - log.Printf("using helper on %s", options.HelperAddr) + log.Printf("using helper on %s", helperRoundTripper.HelperAddr) } if proxy != "" { @@ -439,6 +440,11 @@ func main() { } log.Printf("using proxy %s", options.ProxyURL.String()) httpRoundTripper.Proxy = http.ProxyURL(options.ProxyURL) + err = helperRoundTripper.SetProxy(options.ProxyURL) + if err != nil { + pt.ProxyError(err.Error()) + log.Fatal(fmt.Sprintf("proxy error: %s", err)) + } if ptInfo.ProxyURL != nil { pt.ProxyDone() }

1 0

[tpo/staging] empty body generates .pot error
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 6e361c1e03699ccb67097e7284429b6f5e695053 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jan 15 07:14:14 2019 +0100 empty body generates .pot error --- content/download/contents.lr | 1 + 1 file changed, 1 insertion(+) diff --git a/content/download/contents.lr b/content/download/contents.lr index ed2a069..d2963fd 100644 --- a/content/download/contents.lr +++ b/content/download/contents.lr @@ -9,3 +9,4 @@ color: dark title: download --- body: +Download Tor Browser

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 15 Jan '19

15 Jan '19

commit 70d04a26cef51cfbae204b9d1c3509ba016ef478 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 15 05:46:12 2019 +0000 Update translations for tails-misc_completed --- tr.po | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/tr.po b/tr.po index 1ceb331f8..f9c4638bc 100644 --- a/tr.po +++ b/tr.po @@ -13,7 +13,7 @@ # ecocan <eecocan(a)yahoo.com>, 2014 # Emma Peel, 2018 # imratirtil <d.imra.gundogdu(a)gmail.com>, 2014 -# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2018 +# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2019 # metint, 2014 # metint, 2014 # Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015-2016 @@ -28,9 +28,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-07 10:24+0100\n" -"PO-Revision-Date: 2018-12-07 13:55+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2019-01-14 20:19+0100\n" +"PO-Revision-Date: 2019-01-15 05:20+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -112,6 +112,26 @@ msgstr "_Başlat" msgid "_Exit" msgstr "Çı_kış" +#: config/chroot_local-includes/usr/local/bin/keepassx:17 +#, sh-format +msgid "" +"<big>Do you want to rename your KeePassX database?</big>\n" +"\n" +"You have a KeePassX database in your Persistent folder:\n" +"\n" +"${filename}\n" +"\n" +"Renaming it to keepassx.kdbx would allow KeePassX to open it automatically in the future." +msgstr "<big>KeePassX veritabanınızı yeniden adlandrımak isterser misiniz?</big>\n\nKalıcı klasörünüzde bir KeePassX veritabanı var:\n\n${filename}\n\nBu dosyayı keepassx.kdbx olarak yeniden adlandırarak gelecekte KeePassX ile otomatik olarak açılmasını sağlayabilirsiniz." + +#: config/chroot_local-includes/usr/local/bin/keepassx:25 +msgid "Rename" +msgstr "Yeniden Adlandır" + +#: config/chroot_local-includes/usr/local/bin/keepassx:26 +msgid "Keep current name" +msgstr "Geçerli ad korunsun" + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart" msgstr "Yeniden başlat"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 15 Jan '19

15 Jan '19

commit 508119d8bffda002cb0b200294a1b080a8c092b7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 15 05:46:07 2019 +0000 Update translations for tails-misc --- tr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tr.po b/tr.po index 0c2d66a18..f9c4638bc 100644 --- a/tr.po +++ b/tr.po @@ -13,7 +13,7 @@ # ecocan <eecocan(a)yahoo.com>, 2014 # Emma Peel, 2018 # imratirtil <d.imra.gundogdu(a)gmail.com>, 2014 -# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2018 +# Kaya Zeren <kayazeren(a)gmail.com>, 2015-2019 # metint, 2014 # metint, 2014 # Ozancan Karataş <ozancankaratas96(a)outlook.com>, 2015-2016 @@ -29,8 +29,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-14 20:19+0100\n" -"PO-Revision-Date: 2019-01-15 01:38+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-01-15 05:20+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -122,15 +122,15 @@ msgid "" "${filename}\n" "\n" "Renaming it to keepassx.kdbx would allow KeePassX to open it automatically in the future." -msgstr "" +msgstr "<big>KeePassX veritabanınızı yeniden adlandrımak isterser misiniz?</big>\n\nKalıcı klasörünüzde bir KeePassX veritabanı var:\n\n${filename}\n\nBu dosyayı keepassx.kdbx olarak yeniden adlandırarak gelecekte KeePassX ile otomatik olarak açılmasını sağlayabilirsiniz." #: config/chroot_local-includes/usr/local/bin/keepassx:25 msgid "Rename" -msgstr "" +msgstr "Yeniden Adlandır" #: config/chroot_local-includes/usr/local/bin/keepassx:26 msgid "Keep current name" -msgstr "" +msgstr "Geçerli ad korunsun" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 14 Jan '19

14 Jan '19

commit 9f1b73653cc44553d40748fae3d98a59ea69ae95 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 15 01:47:04 2019 +0000 Update translations for tails-misc_completed --- tails.pot | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tails.pot b/tails.pot index d05a9fbd8..93ca05bb6 100644 --- a/tails.pot +++ b/tails.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-07 10:24+0100\n" -"PO-Revision-Date: 2018-12-07 13:55+0000\n" +"POT-Creation-Date: 2019-01-14 20:19+0100\n" +"PO-Revision-Date: 2019-01-15 01:38+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)\n" "MIME-Version: 1.0\n" @@ -91,6 +91,26 @@ msgstr "_Launch" msgid "_Exit" msgstr "_Exit" +#: config/chroot_local-includes/usr/local/bin/keepassx:17 +#, sh-format +msgid "" +"<big>Do you want to rename your KeePassX database?</big>\n" +"\n" +"You have a KeePassX database in your Persistent folder:\n" +"\n" +"${filename}\n" +"\n" +"Renaming it to keepassx.kdbx would allow KeePassX to open it automatically in the future." +msgstr "<big>Do you want to rename your KeePassX database?</big>\n\nYou have a KeePassX database in your Persistent folder:\n\n${filename}\n\nRenaming it to keepassx.kdbx would allow KeePassX to open it automatically in the future." + +#: config/chroot_local-includes/usr/local/bin/keepassx:25 +msgid "Rename" +msgstr "Rename" + +#: config/chroot_local-includes/usr/local/bin/keepassx:26 +msgid "Keep current name" +msgstr "Keep current name" + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart" msgstr "Restart"

1 0