- tor-commits - lists.torproject.org

[tor-browser/tor-browser-68.7.0esr-9.5-1] Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit f81583b0d6d7eefd4b7384e8ee95d528ea4fb303 Merge: 5a8128b566fa e577d655d204 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 20:04:14 2020 +0000 Merge branch 'bradetpo/bug32418-01' into tor-browser-68.7.0esr-9.5-1 .../enterprisepolicies/EnterprisePolicies.js | 32 ++++++++++++++++++++-- toolkit/components/enterprisepolicies/moz.build | 4 ++- toolkit/mozapps/update/UpdateService.jsm | 20 ++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-)

1 0

[snowflake-webext/master] bump version to 0.2.3
by cohosh＠torproject.org 28 Apr '20

28 Apr '20

commit d05041a24a1bc0c87f7c00a018f27cb7238f8d91 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Apr 28 16:21:04 2020 -0400 bump version to 0.2.3 --- translation | 2 +- webext/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/translation b/translation index 9ce163a..a144799 160000 --- a/translation +++ b/translation @@ -1 +1 @@ -Subproject commit 9ce163a282fcd35e3cc6b642b0236e237dc56159 +Subproject commit a144799d59a75a4b2f812958378829469e7ea75f diff --git a/webext/manifest.json b/webext/manifest.json index c3ccfa7..7eacc11 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.2.2", + "version": "0.2.3", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[snowflake-webext/master] Update node wrtc version for web proxies
by cohosh＠torproject.org 28 Apr '20

28 Apr '20

commit 4d59bcbb4deace2e7acc5f4aaabde7da3f91884b Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Apr 28 14:32:13 2020 -0400 Update node wrtc version for web proxies --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 772746e..adceb3d 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ }, "dependencies": { "cldr": "^5.4.1", - "wrtc": "^0.0.61", + "wrtc": "^0.4.4", "ws": "^3.3.1", "xmlhttprequest": "^1.8.0" }

1 0

[tor-browser-build/maint-9.0] Openssl version bump is only on Win/macOS/Linux
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit ccef18adc1cae3dc652c0b617d6db1d0b1df6631 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 18:36:23 2020 +0000 Openssl version bump is only on Win/macOS/Linux --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 6f66cad..18c2c76 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.10 -- May 5 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Windows + OS X + Linux * Bug 34017: Bump openssl version to 1.1.1g Tor Browser 9.0.9 -- April 7 2020

1 0

[snowflake/master] Restore check for nil writePipe in WebRTCPeer.Close.
by dcf＠torproject.org 28 Apr '20

28 Apr '20

commit 72cfb96edeb7c9a3c93d38539bc31a51e30dbe8d Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 28 11:33:09 2020 -0600 Restore check for nil writePipe in WebRTCPeer.Close. I removed this check in 047d3214bfb46de07e5d9f223e4fb1ba24584c8a because NewWebRTCPeer always initializes writePipe, and it is never reset to nil. However tests used &WebRTCPeer{} which bypasses NewWebRTCPeer and leaves writePipe set to nil. https://bugs.torproject.org/34049#comment:3 https://bugs.torproject.org/34050 --- client/lib/webrtc.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index edc8ab4..23cb3e1 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -236,7 +236,9 @@ func exchangeSDP(broker *BrokerChannel, offer *webrtc.SessionDescription) *webrt // Close all channels and transports func (c *WebRTCPeer) cleanup() { // Close this side of the SOCKS pipe. - c.writePipe.Close() + if c.writePipe != nil { // c.writePipe can be nil in tests. + c.writePipe.Close() + } if nil != c.transport { log.Printf("WebRTC: closing DataChannel") c.transport.Close()

1 0

[tor-browser-build/maint-9.0] Bug 34017 - Bump openssl version to 1.1.1g
by sysrqb＠torproject.org 28 Apr '20

28 Apr '20

commit b92fb2a97d0c15db625d979b7d24df628dad1477 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 28 17:19:41 2020 +0000 Bug 34017 - Bump openssl version to 1.1.1g --- projects/openssl/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/openssl/config b/projects/openssl/config index 8ee3b69..f5f16b0 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.1.1f +version: 1.1.1g filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: @@ -28,6 +28,6 @@ input_files: - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: 186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35 + sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 - filename: use-SOURCE_DATE_EPOCH.patch enable: '[% c("var/windows") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index b0b7a8c..6f66cad 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,7 @@ Tor Browser 9.0.10 -- May 5 2020 * All Platforms * Update Firefox to 68.8.0esr * Bump NoScript to 11.0.25 + * Bug 34017: Bump openssl version to 1.1.1g Tor Browser 9.0.9 -- April 7 2020 * All Platforms

1 0

[tpo/master] Add jnewsome's mastodon handle
by gus＠torproject.org 28 Apr '20

28 Apr '20

commit 9c75980403a512aa19623126dac9d1ec80dbc7a4 Author: Jim Newsome <jnewsome(a)torproject.org> Date: Tue Apr 28 17:06:18 2020 +0000 Add jnewsome's mastodon handle --- content/about/people/jnewsome/contents.lr | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/about/people/jnewsome/contents.lr b/content/about/people/jnewsome/contents.lr index 92bbd0fe..416c7eb2 100644 --- a/content/about/people/jnewsome/contents.lr +++ b/content/about/people/jnewsome/contents.lr @@ -10,6 +10,8 @@ pronoun: he --- nickname: jnewsome --- +mastodon: sporksmith(a)mastodon.social +--- twitter_handle: sporksmith --- gpg: /static/keys/jnewsome.txt

1 0

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

28 Apr '20

commit 61b0e3d031a433ad723ca65a9dd2a2ffd9a312f5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 28 17:15:33 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+fa.po | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index aebb309b83..1988a90813 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -12083,6 +12083,13 @@ msgid "" "continue to be protected under the DMCA 512(a) safe harbor without taking " "any further action." msgstr "" +"اینکه چه چیزی یک سیاست منطقی را ایجاد می کند، همانطور که قانون می گوید، " +"سرویس به اشتراک حساب هایی که مکرراً قانون را نقض می کنند پایان می دهد. " +"اخطاری که شما دریافت کردید این نقض مکرر را ثابت نمی کند و برای همین نیازی به" +" حذف آن مشترک نیست. در واقع، حتی مدرک یک نقض کپی‌رایت نیز نیست. یک اخطاریه " +"که اعلام نقض می کند به معنی نقض نیست. من هیچ کپی‌رایتی را نقض نکرده ام و قصد" +" چنین کاری را نیز ندارم. بنابراین، شما باید شامل محافظت DMCA 512(a) بشوید " +"بدون اینکه نیاز باشد کار بیشتری را انجام دهید." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents+en.lrpage.body) @@ -12105,6 +12112,19 @@ msgid "" "protecting the privacy of its customers, you'll agree that this is a " "valuable technology." msgstr "" +"شاید کنجکاو باشید که چه چیزی باعث دریافت چنین اخطاریه ای شده است. احتمالاً " +"به خاطر برنامه ای است که من اجرا می کنم و تور نام دارد. تور یک نرم افزار است" +" که به کاربران کمک می کند تا امنیت و حریم خصوصی آنلاین خود را بهبود ببخشند. " +"هیچ محتوایی را میزبانی نمی کند. در عوض بخشی از شبکه است که از گره ها تشکیل " +"شده و برای عبور بسته ها بین آن ها می باشد تا در پایان آن ها را به مقاصد " +"ارسال کنند. تور به نحوی این کار را انجام می دهد که هیچکس از مبدا و مقصد بسته" +" ها نمی تواند آگاه شود و این به کاربران اجازه می دهد تا از شنود ترافیک شبکه " +"در امان باشند. تور از کاربران در برابر خطراتی همچون آزار و اذیت، اسپم و سرقت" +" هویت محافظت می کند. توسعه آغازین تور بخشی از پروژه آزمایشگاه تحقیقاتی " +"دریایی آمریکا بوده که توسط ONR و DARPA سرمایه گذاری شده بود. (برای اطلاعات " +"بیشتر روی تور، لطفاً https://www.torproject.org/ را ببینید.) امیدوارم، به " +"عنوان سازمانی که به حفاظت از حریم خصوصی مشتریان اش پایبند است با چنین " +"تکنولوژی ارزشمندی موافق باشید." #: https//community.torproject.org/relay/community-resources/eff-tor-legal-faq/tor-dmca-response/ #: (content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents+en.lrpage.body)

1 0

[snowflake/master] Update calls to session description utils in proxy
by cohosh＠torproject.org 28 Apr '20

28 Apr '20

commit 1d2df3cd719cc6074880ed7f6a39f9eae535dee1 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Apr 28 12:55:58 2020 -0400 Update calls to session description utils in proxy --- proxy/snowflake.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/proxy/snowflake.go b/proxy/snowflake.go index 422cf7e..4877e6f 100644 --- a/proxy/snowflake.go +++ b/proxy/snowflake.go @@ -200,7 +200,13 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription { return nil } if offer != "" { - return util.DeserializeSessionDescription(offer) + offer, err := util.DeserializeSessionDescription(offer) + if err != nil { + log.Printf("Error processing session description: %s", err.Error()) + return nil + } + return offer + } } } @@ -217,7 +223,10 @@ func (b *Broker) sendAnswer(sid string, pc *webrtc.PeerConnection) error { SDP: util.StripLocalAddresses(ld.SDP), } } - answer := string([]byte(util.SerializeSessionDescription(ld))) + answer, err := util.SerializeSessionDescription(ld) + if err != nil { + return err + } body, err := messages.EncodeAnswerRequest(answer, sid) if err != nil { return err

1 0

[snowflake/master] Update proxy tests to check serialization errors
by cohosh＠torproject.org 28 Apr '20

28 Apr '20

commit 5e8f9ac538002ef9d7ec195ccbcd51401755c657 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Apr 28 13:01:32 2020 -0400 Update proxy tests to check serialization errors --- proxy/proxy-go_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/proxy/proxy-go_test.go b/proxy/proxy-go_test.go index bed00f2..03d7307 100644 --- a/proxy/proxy-go_test.go +++ b/proxy/proxy-go_test.go @@ -198,7 +198,7 @@ func TestSessionDescriptions(t *testing.T) { }, }, } { - desc := util.DeserializeSessionDescription(test.msg) + desc, _ := util.DeserializeSessionDescription(test.msg) So(desc, ShouldResemble, test.ret) } }) @@ -215,8 +215,9 @@ func TestSessionDescriptions(t *testing.T) { `{"type":"offer","sdp":"test"}`, }, } { - msg := util.SerializeSessionDescription(test.desc) + msg, err := util.SerializeSessionDescription(test.desc) So(msg, ShouldResemble, test.ret) + So(err, ShouldBeNil) } }) } @@ -240,7 +241,7 @@ func TestBrokerInteractions(t *testing.T) { }, } pc, _ := webrtc.NewPeerConnection(config) - offer := util.DeserializeSessionDescription(sampleOffer) + offer, _ := util.DeserializeSessionDescription(sampleOffer) pc.SetRemoteDescription(*offer) answer, _ := pc.CreateAnswer(nil) pc.SetLocalDescription(answer)

1 0