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

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 13 Oct '17

13 Oct '17

commit ca24bfce0d7c8e1030ea92a4e48d5df60daf7f05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 13 20:15:35 2017 +0000 Update translations for whisperback_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index 26be2ec1a..05011bce5 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-26 15:13+0000\n" +"PO-Revision-Date: 2017-10-13 20:05+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 13 Oct '17

13 Oct '17

commit 1ec00c381a96ba3d8a9a1be1cdeaf210454b3deb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 13 20:15:27 2017 +0000 Update translations for whisperback --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index 26be2ec1a..05011bce5 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-09-26 15:13+0000\n" +"PO-Revision-Date: 2017-10-13 20:05+0000\n" "Last-Translator: French language coordinator <french.coordinator(a)rbox.me>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[snowflake/master] Bump go version on travis to 1.8.3
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit 13b31f64941a02530d27cbc08dd2eb65ddf70502 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 18:32:55 2017 -0400 Bump go version on travis to 1.8.3 * Same as currently used in TB, https://gitweb.torproject.org/builders/tor-browser-build.git/tree/projects/… * Also, necessary for the "context" import in acme/autocert --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e96efc..df7bbe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ addons: - gcc-5 go: - - 1.6 + - 1.8.3 env: - TRAVIS_NODE_VERSION="4.2" CC="gcc-5" CXX="g++-5"

1 0

[snowflake/master] Use the "context" package in go 1.7
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit 82d7f16babcdacdd120465fdd80b3468ea03246c Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 18:39:03 2017 -0400 Use the "context" package in go 1.7 * Since we're now assuming >= 1.8.3 --- appengine/reflect.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appengine/reflect.go b/appengine/reflect.go index f5aa3c8..24f4d95 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -3,12 +3,12 @@ package reflect import ( + "context" "io" "net/http" "net/url" "time" - "golang.org/x/net/context" "google.golang.org/appengine" "google.golang.org/appengine/log" "google.golang.org/appengine/urlfetch" @@ -75,7 +75,9 @@ func handler(w http.ResponseWriter, r *http.Request) { return } if urlFetchTimeout != 0 { - context_, _ = context.WithTimeout(context_, urlFetchTimeout) + var cancel context.CancelFunc + context_, cancel = context.WithTimeout(context_, urlFetchTimeout) + defer cancel() } // Use urlfetch.Transport directly instead of urlfetch.Client because we // want only a single HTTP transaction, not following redirects.

1 0

[snowflake/master] Use context.WithTimeout instead of transport.Deadline
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit fea9df75403b35753493585b073cd3eec1aa3c7d Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 18:12:11 2017 -0400 Use context.WithTimeout instead of transport.Deadline * The field was removed in, https://github.com/golang/appengine/commit/11ed51af43a1f8a9ce2afc951b10dbb7… --- appengine/reflect.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/appengine/reflect.go b/appengine/reflect.go index c48bfe6..f5aa3c8 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -74,14 +74,13 @@ func handler(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) return } + if urlFetchTimeout != 0 { + context_, _ = context.WithTimeout(context_, urlFetchTimeout) + } // Use urlfetch.Transport directly instead of urlfetch.Client because we // want only a single HTTP transaction, not following redirects. transport := urlfetch.Transport{ Context: context_, - // Despite the name, Transport.Deadline is really a timeout and - // not an absolute deadline as used in the net package. In - // other words it is a time.Duration, not a time.Time. - Deadline: urlFetchTimeout, } resp, err := transport.RoundTrip(fr) if err != nil {

1 0

[snowflake/master] Go get another missing dep in travis
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit ab4bd77cb47114ed71699e775e507d8103038f64 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 17:32:47 2017 -0400 Go get another missing dep in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ed6f54..3e96efc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,7 @@ install: - go get -u git.torproject.org/pluggable-transports/goptlib.git - go get -u git.torproject.org/pluggable-transports/websocket.git/websocket - go get -u google.golang.org/appengine + - go get -u golang.org/x/crypto/acme/autocert - pushd proxy - npm install - popd

1 0

[snowflake/master] Add missing import removed in 0c02af3
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit 3b9a4624bd1b4db0afcb6d2dbb928379ec419218 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 17:26:32 2017 -0400 Add missing import removed in 0c02af3 --- client/util.go | 1 + 1 file changed, 1 insertion(+) diff --git a/client/util.go b/client/util.go index c90e17d..20817c3 100644 --- a/client/util.go +++ b/client/util.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "log" "time"

1 0

[snowflake/master] Go get missing dep in travis
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit 66509e6af362ee49116538ea7afd19f3ce0d33de Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 17:24:30 2017 -0400 Go get missing dep in travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 551cd91..5ed6f54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ install: - go get -u github.com/dchest/uniuri - go get -u git.torproject.org/pluggable-transports/goptlib.git - go get -u git.torproject.org/pluggable-transports/websocket.git/websocket + - go get -u google.golang.org/appengine - pushd proxy - npm install - popd

1 0

[snowflake/master] Update for the latest go-webrtc
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit 441cd8c80f362fc974e0548bf971cd45569d2662 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 17:17:57 2017 -0400 Update for the latest go-webrtc * From https://github.com/keroserene/go-webrtc/pull/59 --- client/webrtc.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/webrtc.go b/client/webrtc.go index 0492466..0f80678 100644 --- a/client/webrtc.go +++ b/client/webrtc.go @@ -197,7 +197,7 @@ func (c *WebRTCPeer) establishDataChannel() error { if c.transport != nil { panic("Unexpected datachannel already exists!") } - dc, err := c.pc.CreateDataChannel(c.id, webrtc.Init{}) + dc, err := c.pc.CreateDataChannel(c.id) // Triggers "OnNegotiationNeeded" on the PeerConnection, which will prepare // an SDP offer while other goroutines operating on this struct handle the // signaling. Eventually fires "OnOpen".

1 0

[snowflake/master] Updating from legacy (import "appengine") packages
by arlo＠torproject.org 12 Oct '17

12 Oct '17

commit fd217ffaab7aaae6014f0a2436d9680728e18bbd Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Oct 12 17:15:08 2017 -0400 Updating from legacy (import "appengine") packages * Ran, `go get google.golang.org/appengine/cmd/aefix` from https://github.com/golang/appengine --- appengine/reflect.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/appengine/reflect.go b/appengine/reflect.go index f6b5336..c48bfe6 100644 --- a/appengine/reflect.go +++ b/appengine/reflect.go @@ -8,8 +8,10 @@ import ( "net/url" "time" - "appengine" - "appengine/urlfetch" + "golang.org/x/net/context" + "google.golang.org/appengine" + "google.golang.org/appengine/log" + "google.golang.org/appengine/urlfetch" ) const ( @@ -18,7 +20,7 @@ const ( urlFetchTimeout = 20 * time.Second ) -var context appengine.Context +var context_ context.Context // Join two URL paths. func pathJoin(a, b string) string { @@ -65,17 +67,17 @@ func copyRequest(r *http.Request) (*http.Request, error) { } func handler(w http.ResponseWriter, r *http.Request) { - context = appengine.NewContext(r) + context_ = appengine.NewContext(r) fr, err := copyRequest(r) if err != nil { - context.Errorf("copyRequest: %s", err) + log.Errorf(context_, "copyRequest: %s", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } // Use urlfetch.Transport directly instead of urlfetch.Client because we // want only a single HTTP transaction, not following redirects. transport := urlfetch.Transport{ - Context: context, + Context: context_, // Despite the name, Transport.Deadline is really a timeout and // not an absolute deadline as used in the net package. In // other words it is a time.Duration, not a time.Time. @@ -83,7 +85,7 @@ func handler(w http.ResponseWriter, r *http.Request) { } resp, err := transport.RoundTrip(fr) if err != nil { - context.Errorf("RoundTrip: %s", err) + log.Errorf(context_, "RoundTrip: %s", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -99,7 +101,7 @@ func handler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(resp.StatusCode) n, err := io.Copy(w, resp.Body) if err != nil { - context.Errorf("io.Copy after %d bytes: %s", n, err) + log.Errorf(context_, "io.Copy after %d bytes: %s", n, err) } }

1 0