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

[snowflake/master] Ported snowflake client to work with pion/webrtc
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit b5c50b69d080fe488620367a1203ec3c67bb93b1 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jun 25 16:35:37 2019 -0400 Ported snowflake client to work with pion/webrtc Modified the snowflake client to use pion/webrtc as the webrtc library. This involved a few small changes to match function signatures as well as several larger ones: - OnNegotiationNeeded is no longer supported, so CreateOffer and SetLocalDescription have been moved to a go routine called after the other peer connection callbacks are set - We need our own deserialize/serialize functions - We need to use a SettingEngine in order to access the OnICEGatheringStateChange callback --- client/lib/interfaces.go | 2 +- client/lib/lib_test.go | 14 +++---- client/lib/rendezvous.go | 21 ++++++----- client/lib/util.go | 59 +++++++++++++++++++++++++---- client/lib/webrtc.go | 98 ++++++++++++++++++++++++++---------------------- client/snowflake.go | 28 ++++++++++---- 6 files changed, 146 insertions(+), 76 deletions(-) diff --git a/client/lib/interfaces.go b/client/lib/interfaces.go index f62d4f5..609e610 100644 --- a/client/lib/interfaces.go +++ b/client/lib/interfaces.go @@ -52,5 +52,5 @@ type SocksConnector interface { // Interface for the Snowflake's transport. (Typically just webrtc.DataChannel) type SnowflakeDataChannel interface { io.Closer - Send([]byte) + Send([]byte) error } diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index 4f74cb3..4e9e2c7 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -8,7 +8,7 @@ import ( "net/http" "testing" - "github.com/keroserene/go-webrtc" + "github.com/pion/webrtc" . "github.com/smartystreets/goconvey/convey" ) @@ -17,9 +17,10 @@ type MockDataChannel struct { done chan bool } -func (m *MockDataChannel) Send(data []byte) { +func (m *MockDataChannel) Send(data []byte) error { m.destination.Write(data) m.done <- true + return nil } func (*MockDataChannel) Close() error { return nil } @@ -217,11 +218,11 @@ func TestSnowflakeClient(t *testing.T) { c.offerChannel = make(chan *webrtc.SessionDescription, 1) c.answerChannel = make(chan *webrtc.SessionDescription, 1) - c.config = webrtc.NewConfiguration() + c.config = &webrtc.Configuration{} c.preparePeerConnection() c.offerChannel <- nil - answer := webrtc.DeserializeSessionDescription( + answer := deserializeSessionDescription( `{"type":"answer","sdp":""}`) c.answerChannel <- answer c.exchangeSDP() @@ -264,12 +265,11 @@ func TestSnowflakeClient(t *testing.T) { }) Convey("Rendezvous", t, func() { - webrtc.SetLoggingVerbosity(0) transport := &MockTransport{ http.StatusOK, []byte(`{"type":"answer","sdp":"fake"}`), } - fakeOffer := webrtc.DeserializeSessionDescription("test") + fakeOffer := deserializeSessionDescription(`{"type":"offer","sdp":"test"}`) Convey("Construct BrokerChannel with no front domain", func() { b := NewBrokerChannel("test.broker", "", transport) @@ -291,7 +291,7 @@ func TestSnowflakeClient(t *testing.T) { answer, err := b.Negotiate(fakeOffer) So(err, ShouldBeNil) So(answer, ShouldNotBeNil) - So(answer.Sdp, ShouldResemble, "fake") + So(answer.SDP, ShouldResemble, "fake") }) Convey("BrokerChannel.Negotiate fails with 503", func() { diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 54ce459..8f994f4 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -17,7 +17,7 @@ import ( "net/http" "net/url" - "github.com/keroserene/go-webrtc" + "github.com/pion/webrtc" ) const ( @@ -84,7 +84,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( *webrtc.SessionDescription, error) { log.Println("Negotiating via BrokerChannel...\nTarget URL: ", bc.Host, "\nFront URL: ", bc.url.Host) - data := bytes.NewReader([]byte(offer.Serialize())) + data := bytes.NewReader([]byte(serializeSessionDescription(offer))) // Suffix with broker's client registration handler. clientURL := bc.url.ResolveReference(&url.URL{Path: "client"}) request, err := http.NewRequest("POST", clientURL.String(), data) @@ -107,7 +107,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } - answer := webrtc.DeserializeSessionDescription(string(body)) + answer := deserializeSessionDescription(string(body)) return answer, nil case http.StatusServiceUnavailable: @@ -126,15 +126,18 @@ type WebRTCDialer struct { } func NewWebRTCDialer( - broker *BrokerChannel, iceServers IceServerList) *WebRTCDialer { - config := webrtc.NewConfiguration(iceServers...) - if nil == config { - log.Println("Unable to prepare WebRTC configuration.") - return nil + broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { + var config webrtc.Configuration + if iceServers == nil { + config = webrtc.Configuration{ + ICEServers: iceServers, + } + } else { + config = webrtc.Configuration{} } return &WebRTCDialer{ BrokerChannel: broker, - webrtcConfig: config, + webrtcConfig: &config, } } diff --git a/client/lib/util.go b/client/lib/util.go index 028fb1c..f385279 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -1,23 +1,17 @@ package lib import ( - "fmt" + "encoding/json" "log" "time" - "github.com/keroserene/go-webrtc" + "github.com/pion/webrtc" ) const ( LogTimeInterval = 5 ) -type IceServerList []webrtc.ConfigurationOption - -func (i *IceServerList) String() string { - return fmt.Sprint(*i) -} - type BytesLogger interface { Log() AddOutbound(int) @@ -93,3 +87,52 @@ func (b *BytesSyncLogger) AddInbound(amount int) { } b.InboundChan <- amount } +func deserializeSessionDescription(msg string) *webrtc.SessionDescription { + var parsed map[string]interface{} + err := json.Unmarshal([]byte(msg), &parsed) + if nil != err { + log.Println(err) + return nil + } + if _, ok := parsed["type"]; !ok { + log.Println("Cannot deserialize SessionDescription without type field.") + return nil + } + if _, ok := parsed["sdp"]; !ok { + log.Println("Cannot deserialize SessionDescription without sdp field.") + return nil + } + + var stype webrtc.SDPType + switch parsed["type"].(string) { + default: + log.Println("Unknown SDP type") + return nil + case "offer": + stype = webrtc.SDPTypeOffer + case "pranswer": + stype = webrtc.SDPTypePranswer + case "answer": + stype = webrtc.SDPTypeAnswer + case "rollback": + stype = webrtc.SDPTypeRollback + } + + if err != nil { + log.Println(err) + return nil + } + return &webrtc.SessionDescription{ + Type: stype, + SDP: parsed["sdp"].(string), + } +} + +func serializeSessionDescription(desc *webrtc.SessionDescription) string { + bytes, err := json.Marshal(*desc) + if nil != err { + log.Println(err) + return "" + } + return string(bytes) +} diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 6406da5..dbc205e 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -9,7 +9,7 @@ import ( "time" "github.com/dchest/uniuri" - "github.com/keroserene/go-webrtc" + "github.com/pion/webrtc" ) // Remote WebRTC peer. @@ -151,48 +151,54 @@ func (c *WebRTCPeer) Connect() error { // Create and prepare callbacks on a new WebRTC PeerConnection. func (c *WebRTCPeer) preparePeerConnection() error { if nil != c.pc { - c.pc.Destroy() + c.pc.Close() c.pc = nil } - pc, err := webrtc.NewPeerConnection(c.config) + s := webrtc.SettingEngine{} + s.SetTrickle(true) + api := webrtc.NewAPI(webrtc.WithSettingEngine(s)) + pc, err := api.NewPeerConnection(*c.config) if err != nil { log.Printf("NewPeerConnection ERROR: %s", err) return err } // Prepare PeerConnection callbacks. - pc.OnNegotiationNeeded = func() { - log.Println("WebRTC: OnNegotiationNeeded") - go func() { - offer, err := pc.CreateOffer() - // TODO: Potentially timeout and retry if ICE isn't working. - if err != nil { - c.errorChannel <- err - return - } - err = pc.SetLocalDescription(offer) - if err != nil { - c.errorChannel <- err - return - } - }() - } - // Allow candidates to accumulate until IceGatheringStateComplete. - pc.OnIceCandidate = func(candidate webrtc.IceCandidate) { - log.Printf(candidate.Candidate) - } - pc.OnIceGatheringStateChange = func(state webrtc.IceGatheringState) { - if state == webrtc.IceGatheringStateComplete { - log.Printf("WebRTC: IceGatheringStateComplete") + // Allow candidates to accumulate until ICEGatheringStateComplete. + pc.OnICECandidate(func(candidate *webrtc.ICECandidate) { + if candidate == nil { + log.Printf("WebRTC: Done gathering candidates") + } else { + log.Printf("WebRTC: Got ICE candidate: %s", candidate.String()) + } + }) + pc.OnICEGatheringStateChange(func(state webrtc.ICEGathererState) { + if state == webrtc.ICEGathererStateComplete { + log.Println("WebRTC: ICEGatheringStateComplete") c.offerChannel <- pc.LocalDescription() } - } + }) // This callback is not expected, as the Client initiates the creation // of the data channel, not the remote peer. - pc.OnDataChannel = func(channel *webrtc.DataChannel) { + pc.OnDataChannel(func(channel *webrtc.DataChannel) { log.Println("OnDataChannel") panic("Unexpected OnDataChannel!") - } + }) c.pc = pc + go func() { + offer, err := pc.CreateOffer(nil) + // TODO: Potentially timeout and retry if ICE isn't working. + if err != nil { + c.errorChannel <- err + return + } + log.Println("WebRTC: Created offer") + err = pc.SetLocalDescription(offer) + if err != nil { + c.errorChannel <- err + return + } + log.Println("WebRTC: Set local description") + }() log.Println("WebRTC: PeerConnection created.") return nil } @@ -204,7 +210,11 @@ func (c *WebRTCPeer) establishDataChannel() error { if c.transport != nil { panic("Unexpected datachannel already exists!") } - dc, err := c.pc.CreateDataChannel(c.id) + ordered := true + dataChannelOptions := &webrtc.DataChannelInit{ + Ordered: &ordered, + } + dc, err := c.pc.CreateDataChannel(c.id, dataChannelOptions) // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare // an SDP offer while other goroutines operating on this struct handle the // signaling. Eventually fires "OnOpen". @@ -212,7 +222,7 @@ func (c *WebRTCPeer) establishDataChannel() error { log.Printf("CreateDataChannel ERROR: %s", err) return err } - dc.OnOpen = func() { + dc.OnOpen(func() { c.lock.Lock() defer c.lock.Unlock() log.Println("WebRTC: DataChannel.OnOpen") @@ -227,8 +237,8 @@ func (c *WebRTCPeer) establishDataChannel() error { } // Then enable the datachannel. c.transport = dc - } - dc.OnClose = func() { + }) + dc.OnClose(func() { c.lock.Lock() // Future writes will go to the buffer until a new DataChannel is available. if nil == c.transport { @@ -241,29 +251,29 @@ func (c *WebRTCPeer) establishDataChannel() error { // Disable the DataChannel as a write destination. log.Println("WebRTC: DataChannel.OnClose [remotely]") c.transport = nil - c.pc.DeleteDataChannel(dc) + dc.Close() // Unlock before Close'ing, since it calls cleanup and asks for the // lock to check if the transport needs to be be deleted. c.lock.Unlock() c.Close() - } - dc.OnMessage = func(msg []byte) { - if len(msg) <= 0 { + }) + dc.OnMessage(func(msg webrtc.DataChannelMessage) { + if len(msg.Data) <= 0 { log.Println("0 length message---") } - c.BytesLogger.AddInbound(len(msg)) - n, err := c.writePipe.Write(msg) + c.BytesLogger.AddInbound(len(msg.Data)) + n, err := c.writePipe.Write(msg.Data) if err != nil { // TODO: Maybe shouldn't actually close. log.Println("Error writing to SOCKS pipe") c.writePipe.CloseWithError(err) } - if n != len(msg) { + if n != len(msg.Data) { log.Println("Error: short write") panic("short write") } c.lastReceive = time.Now() - } + }) log.Println("WebRTC: DataChannel created.") return nil } @@ -304,7 +314,7 @@ func (c *WebRTCPeer) exchangeSDP() error { } } log.Printf("Received Answer.\n") - err := c.pc.SetRemoteDescription(answer) + err := c.pc.SetRemoteDescription(*answer) if nil != err { log.Println("WebRTC: Unable to SetRemoteDescription:", err) return err @@ -342,13 +352,13 @@ func (c *WebRTCPeer) cleanup() { if c.pc == nil { panic("DataChannel w/o PeerConnection, not good.") } - c.pc.DeleteDataChannel(dataChannel.(*webrtc.DataChannel)) + dataChannel.(*webrtc.DataChannel).Close() } else { c.lock.Unlock() } if nil != c.pc { log.Printf("WebRTC: closing PeerConnection") - err := c.pc.Destroy() + err := c.pc.Close() if nil != err { log.Printf("Error closing peerconnection...") } diff --git a/client/snowflake.go b/client/snowflake.go index 9098de7..01c89d8 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -17,7 +17,7 @@ import ( "git.torproject.org/pluggable-transports/goptlib.git" sf "git.torproject.org/pluggable-transports/snowflake.git/client/lib" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" - "github.com/keroserene/go-webrtc" + "github.com/pion/webrtc" ) const ( @@ -65,6 +65,25 @@ func socksAcceptLoop(ln *pt.SocksListener, snowflakes sf.SnowflakeCollector) err } } +//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 { + log.Printf("url: %s", url) + servers = append(servers, webrtc.ICEServer{ + URLs: []string{url}, + }) + } + return servers +} + func main() { iceServersCommas := flag.String("ice", "", "comma-separated list of ICE servers") brokerURL := flag.String("url", "", "URL of signaling broker") @@ -75,7 +94,6 @@ func main() { "capacity for number of multiplexed WebRTC peers") flag.Parse() - webrtc.SetLoggingVerbosity(1) log.SetFlags(log.LstdFlags | log.LUTC) // Don't write to stderr; versions of tor earlier than about @@ -105,11 +123,7 @@ func main() { log.Println("\n\n\n --- Starting Snowflake Client ---") - var iceServers sf.IceServerList - if len(strings.TrimSpace(*iceServersCommas)) > 0 { - option := webrtc.OptionIceServer(*iceServersCommas) - iceServers = append(iceServers, option) - } + iceServers := parseIceServers(*iceServersCommas) // Prepare to collect remote WebRTC peers. snowflakes := sf.NewPeers(*max)

1 0

[snowflake/master] Make sure command line ice servers are used
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 97bab94e6715b59e4397303d53a05f33d9db1f97 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Sep 3 16:20:05 2019 -0400 Make sure command line ice servers are used This commit fixes a small error introduced in a previous commit. Servers given by command line options weren't being added to the configuration because we were checking for `iceServers` to be nil instead of not nil. --- client/lib/rendezvous.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 8f994f4..b13b841 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -128,7 +128,7 @@ type WebRTCDialer struct { func NewWebRTCDialer( broker *BrokerChannel, iceServers []webrtc.ICEServer) *WebRTCDialer { var config webrtc.Configuration - if iceServers == nil { + if iceServers != nil { config = webrtc.Configuration{ ICEServers: iceServers, }

1 0

[snowflake/master] Bumped Go version to access log.Writer
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 2bf4be71b60330ea80fafb14cd269a8ed94bb2e1 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Sep 13 15:06:40 2019 -0400 Bumped Go version to access log.Writer --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9ed48bb..cfec2a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: - gcc-5 go: - - 1.10.x + - 1.13.x env: - TRAVIS_NODE_VERSION="8" CC="gcc-5" CXX="g++-5"

1 0

[snowflake/master] Updated snowflake client dependencies in README
by cohosh＠torproject.org 08 Oct '19

08 Oct '19

commit 18d793798c04f6daca6063b60624d20169b6aaa4 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Oct 8 09:52:45 2019 -0400 Updated snowflake client dependencies in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 023b41d..fdb039c 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ This should start the client plugin, bootstrapping to 100% using WebRTC. #### Dependencies Client: -- [go-webrtc](https://github.com/keroserene/go-webrtc) -- Go 1.5+ +- [pion/webrtc](https://github.com/pion/webrtc) +- Go 1.10+ Proxy: - JavaScript

1 0

[gettor/master] Update check script
by hiro＠torproject.org 08 Oct '19

08 Oct '19

commit b67a4d8e0c455b410e6c7dacb24ec611a5855bcf Author: hiro <hiro(a)torproject.org> Date: Tue Oct 8 15:53:59 2019 +0200 Update check script --- bin/gettor_check | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/gettor_check b/bin/gettor_check index 2036658..248a714 100755 --- a/bin/gettor_check +++ b/bin/gettor_check @@ -16,5 +16,6 @@ status=$? if test $status -ne 0 then + cd /home/gettor/gettor /home/gettor/gettor/bin/gettor_service start fi

1 0

[translation/snowflake-website-indexhtml_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed
by translation＠torproject.org 08 Oct '19

08 Oct '19

commit bb1b6d91f401745c9d0a6b9fe387d2446b9ed012 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 8 13:17:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- mk/index.html | 105 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 47 insertions(+), 58 deletions(-) diff --git a/mk/index.html b/mk/index.html index 88a5915d8..8d848c74b 100644 --- a/mk/index.html +++ b/mk/index.html @@ -1,39 +1,33 @@ -<!DOCTYPE html> -<html> +<!doctype html> +<html lang="mk"> <head> -<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Snowflake</title> -<link rel="stylesheet" href="index_files/index.asc"> +<link rel="icon" href="assets/favicon.ico"> +<link rel="stylesheet" href="index.css"> </head> <body> - <div id="header"><a href="https://www.torproject.org/"> - <img src="index_files/tor-logo2x.png" alt="Tor" height="50px"></a></div> - <div id="content"> - <h1>SNOWFLAKE</h1> + <header id="header"><a href="https://www.torproject.org/"> + <img src="tor-logo(a)2x.png" alt="Tor" height="50"></a></header><section id="content"><h1>SNOWFLAKE</h1> - <p class="diagram"><img src="index_files/snowflake-schematic.png" alt="Diagram"></p> + <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> <p>Snowflake е систем кој ја поразува интернет цензурата. Луѓето кои се цензурирани може да го користат Snowflake за да пристапуваат на Интернет. Нивното поврзување оди -преку Snowflake проксија, кои се водени од волонтери, За подетални +преку Snowflake проксија, кои се водени од волонтери. За подетални информации за тоа како работи Snowflake видете ја нашата <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">wiki документација</a>.</p> - <div class="clear"> + <div class="sidebyside"> - <div class="browser"><div class="padding"> - <h3>Прелистувач</h3> + <section id="browser" class="browser"><h2>Прелистувач</h2> <p>Ако вашиот пристап на Интернет е цензуриран, треба да го преземете <a href="https://www.torproject.org/download/">Tor Browser</a>.</p> - <p class="screenshot"><img src="index_files/screenshot.png" alt="Tor Browser screenshot"></p> - </div></div> - - <div class="extension"><div class="padding"> - <h3>Проширување</h3> + <p class="screenshot"><img src="screenshot.png" alt="Tor Browser screenshot"></p> + </section><section id="extension" class="extension"><h2>Проширување</h2> <p>Ако вашиот Интернет пристап е <strong>не</strong> цензуриран, би можеле да размислите да гоинсталирате Snowflake проширувањето за да им помогнете на корисниците на цензурираните @@ -42,45 +36,40 @@ одговоара со нивниот излезен Tor јазол, а не со вашиот.</p> <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="index_files/firefox150.jpg" alt="Install in Firefox" height="100px"><br><span>Инсталирај во Firefox</span> - </a> - <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="index_files/chrome150.jpg" alt="Install in Chrome" height="100px"><br><span>Инсталирај во Chrome</span> - </a> - <span class="clear"></span></p> - </div></div> - - </div> - - <h3>ПРИЈАВУВАЊЕ НА ГРЕШКИ</h3> - - <p>Ако се судрите со проблеми со Snowflake како клиент или како пркси, - ве молиме размислете да пријавите грешка. За да го сторите тоа, треба да,</p> - - <ol> -<li>Или да <a href="https://trac.torproject.org/projects/tor/register">создадете - сметка</a> или <a href="https://trac.torproject.org/projects/tor/login">да се најавите</a> - користејќи ја споделената <b>енкриптерска</b> сметка со лозинка <b> внеси код </b>.</li> - <li> -<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Пополни рапорт</a> - користејќи го нашиот следач на грешки.</li> - </ol> -<p>Ве молиме обидете се да бидете што е можно појасни во вашиот рапорт и ако - е можно вклучете ги логовите кои ќе ни помогнат да ја произведеме истата грешка. - Размислете за доддавање на клучни зборови <em>snowflake-webextension</em> или <em>snowflake-client</em> - како би ни кажале во кој дел од Snowflake системот се сретнавте со - проблеми.</p> - - <h3>ВГРАДИ</h3> - - <p>Сега е можно да го вградиш Snowflake беџот на било која веб страна:</p> - - <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320px" height="200px" frameborder="0" scrolling="no"></iframe></textarea><p>Кој изгледа вака:</p> - - <iframe src="index_files/embed.html" scrolling="no" width="320px" height="200px" frameborder="0"></iframe> - - </div> - - + <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>Инсталирај во Firefox</span> + </a> + <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> + <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>Инсталирај во Chrome</span> + </a> </p> + </section> +</div> + + <section id="bugs"><h2>ПРИЈАВУВАЊЕ НА ГРЕШКИ</h2> + + <p>Ако се судртите со проблеми со Snowflake како клиент или прокси, + ве молиме размислете да пријавите грешка. За да го направите тоа, треба да,</p> + + <ol> +<li>Или <a href="https://trac.torproject.org/projects/tor/register">создадете + сметка</a> или <a href="https://trac.torproject.org/projects/tor/login">најавете се</a> + користејќи ја споделената <b>cypherpunks - прикривач на сообраќај</b>сметка со лозинка <b> +за внес </b>.</li> + <li> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Пополнете тикет</a> + користејќи го нашиот скедач на грешки.</li> + </ol> +<p>Ве молиме обидете се да бидете што е можно поопосни со вашиот тикет и ако + е можно вклучете логови кои ќе ни помогнат да ја репродуцираме грешката. + Размислете да додадете клучни зборови <em>snowflake-веб проширување</em> или <em> snowflake-клиент</em> + за да ни кажете каде во системот на Snowflake се судривте со + проблемите. </p> + </section><section id="embed"><h2>ВГРАДИ</h2> + + <p>Сега е можно да го вградиш Snowflake беџот на било која веб страна:</p> + + <textarea readonly><iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe></textarea><p>Кој изгледа вака:</p> + + <iframe src="embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe> + </section></section> </body> </html>

1 0

[translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
by translation＠torproject.org 08 Oct '19

08 Oct '19

commit 74222f376962e800f856d886e165c7e06167912f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 8 13:17:10 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- mk/index.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/mk/index.html b/mk/index.html index b86a74940..8d848c74b 100644 --- a/mk/index.html +++ b/mk/index.html @@ -50,18 +50,19 @@ ве молиме размислете да пријавите грешка. За да го направите тоа, треба да,</p> <ol> -<li>Either <a href="https://trac.torproject.org/projects/tor/register">create an - account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> - using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> +<li>Или <a href="https://trac.torproject.org/projects/tor/register">создадете + сметка</a> или <a href="https://trac.torproject.org/projects/tor/login">најавете се</a> + користејќи ја споделената <b>cypherpunks - прикривач на сообраќај</b>сметка со лозинка <b> +за внес </b>.</li> <li> <a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Пополнете тикет</a> користејќи го нашиот скедач на грешки.</li> </ol> -<p>Please try to be as descriptive as possible with your ticket and if - possible include log messages that will help us reproduce the bug. - Consider adding keywords <em>snowflake-webextension</em> or <em>snowflake-client</em> - to let us know how which part of the Snowflake system is experiencing - problems.</p> +<p>Ве молиме обидете се да бидете што е можно поопосни со вашиот тикет и ако + е можно вклучете логови кои ќе ни помогнат да ја репродуцираме грешката. + Размислете да додадете клучни зборови <em>snowflake-веб проширување</em> или <em> snowflake-клиент</em> + за да ни кажете каде во системот на Snowflake се судривте со + проблемите. </p> </section><section id="embed"><h2>ВГРАДИ</h2> <p>Сега е можно да го вградиш Snowflake беџот на било која веб страна:</p>

1 0

[translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
by translation＠torproject.org 08 Oct '19

08 Oct '19

commit 8fde3761e8c1b23de6a123954571506e6cd8b4e3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 8 12:47:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-i… --- mk/index.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mk/index.html b/mk/index.html index 4afda01ea..b86a74940 100644 --- a/mk/index.html +++ b/mk/index.html @@ -9,13 +9,13 @@ </head> <body> <header id="header"><a href="https://www.torproject.org/"> - <img src="tor-logo(a)2x.png" alt="Tor" height="50"></a></header><section id="content"><h1>SNOWFLAKE</h1> + <img src="tor-logo(a)2x.png" alt="Tor" height="50"></a></header><section id="content"><h1>SNOWFLAKE</h1> <p class="diagram"><img src="https://trac.torproject.org/projects/tor/raw-attachment/wiki/doc/Snowflake/…" alt="Diagram"></p> <p>Snowflake е систем кој ја поразува интернет цензурата. Луѓето кои се цензурирани може да го користат Snowflake за да пристапуваат на Интернет. Нивното поврзување оди -преку Snowflake проксија, кои се водени од волонтери, За подетални +преку Snowflake проксија, кои се водени од волонтери. За подетални информации за тоа како работи Snowflake видете ја нашата <a href="https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/">wiki документација</a>.</p> @@ -36,26 +36,26 @@ одговоара со нивниот излезен Tor јазол, а не со вашиот.</p> <p class="addon"><a href="https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/"> - <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>Install in Firefox</span> - </a> - <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> - <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>Install in Chrome</span> - </a></p> + <img src="firefox150.jpg" alt="Install in Firefox" height="100"><br><span>Инсталирај во Firefox</span> + </a> + <a href="https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmma…"> + <img src="chrome150.jpg" alt="Install in Chrome" height="100"><br><span>Инсталирај во Chrome</span> + </a> </p> </section> </div> <section id="bugs"><h2>ПРИЈАВУВАЊЕ НА ГРЕШКИ</h2> - <p>If you encounter problems with Snowflake as a client or a proxy, - please consider filing a bug. To do so, you will have to,</p> + <p>Ако се судртите со проблеми со Snowflake како клиент или прокси, + ве молиме размислете да пријавите грешка. За да го направите тоа, треба да,</p> <ol> <li>Either <a href="https://trac.torproject.org/projects/tor/register">create an account</a> or <a href="https://trac.torproject.org/projects/tor/login">log in</a> using the shared <b>cypherpunks</b> account with password <b>writecode</b>.</li> <li> -<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">File a ticket</a> - using our bug tracker.</li> +<a href="https://trac.torproject.org/projects/tor/newticket?component=Circumvention%…">Пополнете тикет</a> + користејќи го нашиот скедач на грешки.</li> </ol> <p>Please try to be as descriptive as possible with your ticket and if possible include log messages that will help us reproduce the bug.

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 08 Oct '19

08 Oct '19

commit e1ac43c02e87c8d65b1a92d676be208b86a62a9e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 8 12:23:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 5637e8545..d8e32576b 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -3,9 +3,9 @@ # Emma Peel, 2019 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2019 # David Georges, 2019 -# AO <ao(a)localizationlab.org>, 2019 # erinm, 2019 # N W, 2019 +# AO <ao(a)localizationlab.org>, 2019 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-26 17:56+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: N W, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +86,7 @@ msgstr "Divers" #: https//support.torproject.org/get-in-touch/ #: (content/get-in-touch/contents+en.lrtopic.title) msgid "Get in Touch" -msgstr "Entrer en contact" +msgstr "Communiquer avec nous" #: https//support.torproject.org/apt/ (content/apt/contents+en.lrtopic.title) msgid "Debian Repository"

1 0

[translation/tor-and-https] https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https
by translation＠torproject.org 08 Oct '19

08 Oct '19

commit f18232d60a28867c1707332148d218545d32dd48 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 8 10:52:09 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-and-https --- be.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/be.po b/be.po index 0df2a0029..998824b66 100644 --- a/be.po +++ b/be.po @@ -1,11 +1,12 @@ # # Translators: +# Раман, 2019 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2014-07-17 14:23+0000\n" -"PO-Revision-Date: 2017-09-20 03:03+0000\n" -"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"PO-Revision-Date: 2019-10-08 10:34+0000\n" +"Last-Translator: Раман\n" "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: C/tor-and-https.svg:14 #, no-wrap msgid "Tor and HTTPS" -msgstr "" +msgstr "Tor і HTTPS" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". @@ -46,14 +47,14 @@ msgstr "" #: C/tor-and-https.svg:363 #, no-wrap msgid "data" -msgstr "" +msgstr "звесткі" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". #: C/tor-and-https.svg:363 #, no-wrap msgid "location" -msgstr "" +msgstr "месцазнаходжанне" #. (itstool) path: defs/text #. Keep it short: 3em max. @@ -74,28 +75,28 @@ msgstr "" #: C/tor-and-https.svg:363 #, no-wrap msgid "Hacker" -msgstr "" +msgstr "Хакер" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. #: C/tor-and-https.svg:363 #, no-wrap msgid "Lawyer" -msgstr "" +msgstr "Юрыст" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. #: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" -msgstr "" +msgstr "Сісадмін" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. #: C/tor-and-https.svg:363 #, no-wrap msgid "Police" -msgstr "" +msgstr "Паліцыя" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 @@ -120,16 +121,16 @@ msgstr "Ключ" #: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" -msgstr "" +msgstr "Інтэрнэт-злучэнне" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" -msgstr "" +msgstr "Праслухоўванне" #. (itstool) path: defs/text #: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" -msgstr "" +msgstr "Супольнае карыстанне звесткамі"

1 0