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

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit bc750d4173427a1c719dab2d7bcc25d8263c05e3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 09:53:41 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+es.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index 78fe6694df..515dd1b065 100644 --- a/contents+es.po +++ b/contents+es.po @@ -1080,7 +1080,7 @@ msgstr "" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "(It's also got a fine meaning in German and Turkish.)" -msgstr "" +msgstr "(También tiene un significado interesante en alemán y turco)" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -6396,6 +6396,8 @@ msgid "" "The community team has developed this glossary of terms about and related to" " Tor." msgstr "" +"El equipo de Comunidad ha desarrollado este glosario de términos acerca de y" +" relacionados con Tor." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6432,6 +6434,8 @@ msgid "" "You should not install any additional add-ons on Tor Browser because that " "can compromise some of its privacy features." msgstr "" +"No debes de instalar ningún add-on más en Tor ya que eso podría comprometer" +" tu privacidad." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[meek/turbotunnel] Comment typo.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit 7eb94209f857fc71c2155907b0462cc587fc76cc Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 27 21:39:10 2020 -0700 Comment typo. --- meek-server/turbotunnel.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-server/turbotunnel.go b/meek-server/turbotunnel.go index c45b2fb..293ac76 100644 --- a/meek-server/turbotunnel.go +++ b/meek-server/turbotunnel.go @@ -19,7 +19,7 @@ import ( // The size of receive and send queues. const queueSize = 32 -// ClientID plays the role in HTTPPacketConn that an (IP address, port) tuple +// ClientID plays the role in QueuePacketConn that an (IP address, port) tuple // plays in a net.UDPConn. It is a persistent identifier that binds together all // the HTTP transactions that occur as part of a session. The ClientID is sent // along with all HTTP requests, and the server uses the ClientID to

1 0

[snowflake/master] Close the melt channel, don't just send once on it.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit f1ab65b1c050ee603454f3d9836753512863e21a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 19:22:48 2019 -0700 Close the melt channel, don't just send once on it. Closing the channel makes it always immediately selectable. --- client/lib/peers.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/lib/peers.go b/client/lib/peers.go index 12213e1..d385971 100644 --- a/client/lib/peers.go +++ b/client/lib/peers.go @@ -35,7 +35,7 @@ func NewPeers(max int) *Peers { // Use buffered go channel to pass snowflakes onwards to the SOCKS handler. p.snowflakeChan = make(chan Snowflake, max) p.activePeers = list.New() - p.melt = make(chan struct{}, 1) + p.melt = make(chan struct{}) return p } @@ -110,7 +110,7 @@ func (p *Peers) purgeClosedPeers() { // Close all Peers contained here. func (p *Peers) End() { close(p.snowflakeChan) - p.melt <- struct{}{} + close(p.melt) cnt := p.Count() for e := p.activePeers.Front(); e != nil; { next := e.Next()

1 0

[snowflake/master] NewWebRTCDialer cannot return an error.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit 509f634506d90db2c113de70d50fe8894c542c3a Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 18:00:59 2019 -0700 NewWebRTCDialer cannot return an error. --- client/snowflake.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index bd53f65..99226b8 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -134,10 +134,6 @@ func main() { broker := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport()) snowflakes.Tongue = sf.NewWebRTCDialer(broker, iceServers) - if nil == snowflakes.Tongue { - log.Fatal("Unable to prepare rendezvous method.") - return - } // Use a real logger to periodically output how much traffic is happening. snowflakes.BytesLogger = &sf.BytesSyncLogger{ InboundChan: make(chan int, 5),

1 0

[snowflake/master] Check for an invalid broker URL at a higher level.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit 2fb52c86399b343b296f985a3aa6d568b7b09c96 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 19:57:01 2019 -0700 Check for an invalid broker URL at a higher level. Instead of returning nil from NewBrokerChannel and having WebRTCDialer.Catch check for nil, let NewBrokerChannel return an error and bail out before calling WebRTCDialer.Catch. Suggested by cohosh. https://bugs.torproject.org/33040#comment:3 --- client/lib/rendezvous.go | 9 +++------ client/snowflake.go | 5 ++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 0b15f68..fef0eb5 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -48,10 +48,10 @@ func CreateBrokerTransport() http.RoundTripper { // Construct a new BrokerChannel, where: // |broker| is the full URL of the facilitating program which assigns proxies // to clients, and |front| is the option fronting domain. -func NewBrokerChannel(broker string, front string, transport http.RoundTripper) *BrokerChannel { +func NewBrokerChannel(broker string, front string, transport http.RoundTripper) (*BrokerChannel, error) { targetURL, err := url.Parse(broker) if err != nil { - return nil + return nil, err } log.Println("Rendezvous using Broker at:", broker) bc := new(BrokerChannel) @@ -63,7 +63,7 @@ func NewBrokerChannel(broker string, front string, transport http.RoundTripper) } bc.transport = transport - return bc + return bc, nil } func limitedRead(r io.Reader, limit int64) ([]byte, error) { @@ -141,9 +141,6 @@ func NewWebRTCDialer(broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebR // Initialize a WebRTC Connection by signaling through the broker. func (w WebRTCDialer) Catch() (Snowflake, error) { - if nil == w.BrokerChannel { - return nil, errors.New("cannot Dial WebRTC without a BrokerChannel") - } // TODO: [#3] Fetch ICE server information from Broker. // TODO: [#18] Consider TURN servers here too. connection := NewWebRTCPeer(w.webrtcConfig, w.BrokerChannel) diff --git a/client/snowflake.go b/client/snowflake.go index 1d7907b..7cb9451 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -130,7 +130,10 @@ func main() { snowflakes := sf.NewPeers(*max) // Use potentially domain-fronting broker to rendezvous. - broker := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport()) + broker, err := sf.NewBrokerChannel(*brokerURL, *frontDomain, sf.CreateBrokerTransport()) + if err != nil { + log.Fatalf("parsing broker URL: %v", err) + } snowflakes.Tongue = sf.NewWebRTCDialer(broker, iceServers) // Use a real logger to periodically output how much traffic is happening.

1 0

[snowflake/master] Move ICE server logging out of parseIceServers.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit aa3999857f99e5aa51b7a37366e666e1d1e30af3 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 18:19:28 2019 -0700 Move ICE server logging out of parseIceServers. --- client/snowflake.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 99226b8..b807c8d 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -69,16 +69,13 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { // s is a comma-separated list of ICE server URLs. func parseIceServers(s string) []webrtc.ICEServer { var servers []webrtc.ICEServer - log.Println(s) s = strings.TrimSpace(s) if len(s) == 0 { return nil } urls := strings.Split(s, ",") - log.Printf("Using ICE Servers:") for _, url := range urls { url = strings.TrimSpace(url) - log.Printf("url: %s", url) servers = append(servers, webrtc.ICEServer{ URLs: []string{url}, }) @@ -126,6 +123,10 @@ func main() { log.Println("\n\n\n --- Starting Snowflake Client ---") iceServers := parseIceServers(*iceServersCommas) + log.Printf("Using ICE servers:") + for _, server := range iceServers { + log.Printf("url: %v", strings.Join(server.URLs, " ")) + } // Prepare to collect remote WebRTC peers. snowflakes := sf.NewPeers(*max)

1 0

[snowflake/master] Refactor SOCKS-related logging.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit febb4936f6cf1d066ef87a936e3f92d28c4295e1 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 19:02:01 2019 -0700 Refactor SOCKS-related logging. --- client/snowflake.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index b807c8d..1d7907b 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -47,9 +47,7 @@ func ConnectLoop(snowflakes sf.SnowflakeCollector) { // Accept local SOCKS connections and pass them to the handler. func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { defer ln.Close() - log.Println("Started SOCKS listener.") for { - log.Println("SOCKS listening...") conn, err := ln.AcceptSocks() if err != nil { if err, ok := err.(net.Error); ok && err.Temporary() { @@ -58,7 +56,7 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) { log.Printf("SOCKS accept error: %s", err) break } - log.Println("SOCKS accepted: ", conn.Req) + log.Printf("SOCKS accepted: %v", conn.Req) err = sf.Handler(conn, snowflakes) if err != nil { log.Printf("handler error: %s", err) @@ -167,6 +165,7 @@ func main() { pt.CmethodError(methodName, err.Error()) break } + log.Printf("Started SOCKS listener at %v.", ln.Addr()) go socksAcceptLoop(ln, snowflakes) pt.Cmethod(methodName, ln.Version(), ln.Addr()) listeners = append(listeners, ln)

1 0

[snowflake/master] Simplify NewWebRTCDialer.
by dcf＠torproject.org 27 Jan '20

27 Jan '20

commit db1ba4791b101b7a83060261bb44769dd7db8e25 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Dec 24 20:03:11 2019 -0700 Simplify NewWebRTCDialer. --- client/lib/rendezvous.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index fef0eb5..d117ebc 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -125,13 +125,8 @@ type WebRTCDialer struct { } func NewWebRTCDialer(broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { - var config webrtc.Configuration - if iceServers != nil { - config = webrtc.Configuration{ - ICEServers: iceServers, - } - } else { - config = webrtc.Configuration{} + config := webrtc.Configuration{ + ICEServers: iceServers, } return &WebRTCDialer{ BrokerChannel: broker,

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 27 Jan '20

27 Jan '20

commit f880731c0e56ff8c2f4ace1cd9c27dc3cad1ff4f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 02:45:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+tr.po | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index c98333013b..dd1a02a8f7 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1494,6 +1494,9 @@ msgid "" "network, check out EFF's resources: [Tor on " "campus](https://www.eff.org/torchallenge/tor-on-campus.html)." msgstr "" +"Üniversitenizin ağındaki bir aktarıcı ile ilgili nasıl destek " +"alabileceğinizi öğrenmek için EEF kaynaklarına bakabilirsiniz: [Tor on " +"campus](https://www.eff.org/torchallenge/tor-on-campus.html)." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1506,6 +1509,8 @@ msgid "" "If you work at a Tor-friendly company or organization, that's another ideal " "place to run a relay." msgstr "" +"Tor dostu bir kurum ya da kuruluşta çalışıyorsanız burası da bir aktarıcı " +"işletmek için uygun bir yerdir." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1516,6 +1521,11 @@ msgid "" "Access](https://www.privateinternetaccess.com/), [Boing " "Boing](https://boingboing.net/) and OmuraVPN." msgstr "" +"Aktarıcı işleten bazı kurumlar şunlardır: [Brass Horn " +"Communications](https://brasshorncommunications.uk/), [Quintex Alliance " +"Consulting](https://www.quintex.com/), [Private Internet " +"Access](https://www.privateinternetaccess.com/), [Boing " +"Boing](https://boingboing.net/) ve OmuraVPN." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1525,6 +1535,10 @@ msgid "" "Digitales](https://tor.derechosdigitales.org), [Enjambre " "Digital](https://tor.enjambre.net/) and Lebanon Libraries in New Hampshire." msgstr "" +"Tor aktarıcıları işleten bazı kuruluşlar şunlardır: Digital Courage, [Access" +" Now](https://www.accessnow.org/), [Derechos " +"Digitales](https://tor.derechosdigitales.org), [Enjambre " +"Digital](https://tor.enjambre.net/) ve Lebanon Libraries in New Hampshire." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1538,6 +1552,9 @@ msgid "" "users' connections. This can be either through maliciousness or " "misconfiguration." msgstr "" +"Doğru çalışmayan ya da kullanıcılarının bağlantılarını kurcalayan " +"aktarıcılar kötü olarak işaretlenir. Bu durum kötü amaçlı kullanım ya da " +"hatalı yapılandırmadan kaynaklanıyor olabilir." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1546,6 +1563,10 @@ msgid "" " all your help and vigilance! Learn how you can report [bad relays](bad-" "relays)." msgstr "" +"Kötü aktarıcıların çoğunu geniş topluluğumuz sayesinde yakalıyoruz. Bunun " +"için katkıda bulunan herkese teşekkür ederiz. Ayrıntılı bilgi almak ve nasıl" +" şikayet edileceğini öğrenmek için [kötü aktarıcılar](bad-relays) bölümüne " +"bakabilirsiniz." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1556,6 +1577,7 @@ msgstr "# Diğer kaynaklar" #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Congratulations, you're officially a Tor relay operator! What now?" msgstr "" +"Tebrikler, resmen bir Tor aktarıcı işletmecisi oldunuz. Sırada ne var?" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 27 Jan '20

27 Jan '20

commit befd3ab4e00ac2bd025e8d482e0e362b1ecf5e2b Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 27 23:45:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+tr.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index 919293373b..c98333013b 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1482,6 +1482,10 @@ msgid "" "Washington, Northeastern University, Karlstad University, Universitaet " "Stuttgart, and Friedrich-Alexander University Erlangen-Nuremberg." msgstr "" +"Bunlar, Massachusetts Teknoloji Enstitüsü (MIT CSAIL), Boston Üniversitesi, " +"Waterloo Üniversitesi, Washington Üniversitesi, Northeastern Üniversitesi, " +"Karlstad Üniversitesi, Stuttgart Üniversitesi ve Erlangen-Nuremberg " +"Friedrich-Alexander Üniversitesidir." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body)

1 0