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

[tor/maint-0.4.3] Merge branch 'maint-0.4.1' into maint-0.4.2
by nickm＠torproject.org 18 Mar '20

18 Mar '20

commit 85141a3a74efb0db29ff98667e83b06208d1c926 Merge: 4ee269941 57b1d0848 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:22:36 2020 -0400 Merge branch 'maint-0.4.1' into maint-0.4.2 changes/ticket33119 | 8 +++++ src/feature/dirparse/parsecommon.c | 9 ++++- src/lib/crypt_ops/crypto_rsa.c | 27 +++++++++++---- src/lib/crypt_ops/crypto_rsa.h | 5 ++- src/lib/crypt_ops/crypto_rsa_nss.c | 14 +++++++- src/lib/crypt_ops/crypto_rsa_openssl.c | 63 ++++++++++++++++++++++++++++++++-- src/test/test_crypto.c | 39 +++++++++++++++++++++ 7 files changed, 154 insertions(+), 11 deletions(-)

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 18 Mar '20

18 Mar '20

commit 018c0c831338b4a3232b99bbe1b9744466368eef Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 18 10:16:16 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- da/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/https-everywhere.dtd b/da/https-everywhere.dtd index 5cf49a71de..95209ff2c7 100644 --- a/da/https-everywhere.dtd +++ b/da/https-everywhere.dtd @@ -50,7 +50,7 @@ <!ENTITY https-everywhere.cancel.http_once "Åbn usikker side, kun i denne session"> <!ENTITY https-everywhere.onboarding.intro "Kryptér webbet! Brug HTTPS-sikkerhed automatisk på mange websteder."> -<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere has been updated!"> +<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere er blevet opdateret!"> <!ENTITY https-everywhere.onboarding.details_one "EASE-tilstand optimeret"> <!ENTITY https-everywhere.onboarding.details_two "Du kan nu hvidliste steder for at deaktivere i HTTPS Everywhere"> <!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere er et EFF-projekt">

1 0

[doctor/master] Adjust year in copyright line
by gk＠torproject.org 18 Mar '20

18 Mar '20

commit 282c7e075c8b06f40b1e11a7ee677218b3fd40c4 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Mar 18 08:05:15 2020 +0000 Adjust year in copyright line --- relay_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relay_check.py b/relay_check.py index c9e4878..5621284 100755 --- a/relay_check.py +++ b/relay_check.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright 2018-2019, Damian Johnson and The Tor Project +# Copyright 2018-2020, Damian Johnson and The Tor Project # See LICENSE for licensing information """

1 0

[snowflake/master] Refactor (De)SerializeSessionDescription as common utils
by arlo＠torproject.org 18 Mar '20

18 Mar '20

commit d10af300c128955599aefabba10ac8db7027e063 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Mar 17 15:18:25 2020 -0400 Refactor (De)SerializeSessionDescription as common utils --- client/lib/lib_test.go | 7 +++--- client/lib/rendezvous.go | 5 ++-- client/lib/util.go | 52 ------------------------------------------ common/util/util.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++ proxy-go/proxy-go_test.go | 7 +++--- proxy-go/snowflake.go | 52 +++--------------------------------------- 6 files changed, 72 insertions(+), 109 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index a0e77cb..4b1a9fa 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -9,6 +9,7 @@ import ( "sync" "testing" + "git.torproject.org/pluggable-transports/snowflake.git/common/util" "github.com/pion/webrtc/v2" . "github.com/smartystreets/goconvey/convey" ) @@ -230,7 +231,7 @@ func TestSnowflakeClient(t *testing.T) { So(err, ShouldBeNil) c.offerChannel <- nil - answer := deserializeSessionDescription(sampleAnswer) + answer := util.DeserializeSessionDescription(sampleAnswer) So(answer, ShouldNotBeNil) c.answerChannel <- answer err = c.exchangeSDP() @@ -255,7 +256,7 @@ func TestSnowflakeClient(t *testing.T) { ctx.So(err, ShouldBeNil) wg.Done() }() - answer := deserializeSessionDescription(sampleAnswer) + answer := util.DeserializeSessionDescription(sampleAnswer) c.answerChannel <- answer wg.Wait() }) @@ -285,7 +286,7 @@ func TestSnowflakeClient(t *testing.T) { http.StatusOK, []byte(`{"type":"answer","sdp":"fake"}`), } - fakeOffer := deserializeSessionDescription(`{"type":"offer","sdp":"test"}`) + fakeOffer := util.DeserializeSessionDescription(`{"type":"offer","sdp":"test"}`) Convey("Construct BrokerChannel with no front domain", func() { b, err := NewBrokerChannel("test.broker", "", transport, false) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index d35c813..85f6f1a 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -18,6 +18,7 @@ import ( "net/http" "net/url" + "git.torproject.org/pluggable-transports/snowflake.git/common/util" "github.com/pion/sdp/v2" "github.com/pion/webrtc/v2" ) @@ -140,7 +141,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( SDP: stripLocalAddresses(offer.SDP), } } - data := bytes.NewReader([]byte(serializeSessionDescription(offer))) + data := bytes.NewReader([]byte(util.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) @@ -163,7 +164,7 @@ func (bc *BrokerChannel) Negotiate(offer *webrtc.SessionDescription) ( if nil != err { return nil, err } - answer := deserializeSessionDescription(string(body)) + answer := util.DeserializeSessionDescription(string(body)) return answer, nil case http.StatusServiceUnavailable: return nil, errors.New(BrokerError503) diff --git a/client/lib/util.go b/client/lib/util.go index 1b5f592..cacf1d7 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -1,11 +1,8 @@ package lib import ( - "encoding/json" "log" "time" - - "github.com/pion/webrtc/v2" ) const ( @@ -86,52 +83,3 @@ 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/common/util/util.go b/common/util/util.go new file mode 100644 index 0000000..0a86241 --- /dev/null +++ b/common/util/util.go @@ -0,0 +1,58 @@ +package util + +import ( + "encoding/json" + "log" + + "github.com/pion/webrtc/v2" +) + +func SerializeSessionDescription(desc *webrtc.SessionDescription) string { + bytes, err := json.Marshal(*desc) + if nil != err { + log.Println(err) + return "" + } + return string(bytes) +} + +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), + } +} diff --git a/proxy-go/proxy-go_test.go b/proxy-go/proxy-go_test.go index 2429d1e..bed00f2 100644 --- a/proxy-go/proxy-go_test.go +++ b/proxy-go/proxy-go_test.go @@ -13,6 +13,7 @@ import ( "testing" "git.torproject.org/pluggable-transports/snowflake.git/common/messages" + "git.torproject.org/pluggable-transports/snowflake.git/common/util" "github.com/pion/webrtc/v2" . "github.com/smartystreets/goconvey/convey" ) @@ -197,7 +198,7 @@ func TestSessionDescriptions(t *testing.T) { }, }, } { - desc := deserializeSessionDescription(test.msg) + desc := util.DeserializeSessionDescription(test.msg) So(desc, ShouldResemble, test.ret) } }) @@ -214,7 +215,7 @@ func TestSessionDescriptions(t *testing.T) { `{"type":"offer","sdp":"test"}`, }, } { - msg := serializeSessionDescription(test.desc) + msg := util.SerializeSessionDescription(test.desc) So(msg, ShouldResemble, test.ret) } }) @@ -239,7 +240,7 @@ func TestBrokerInteractions(t *testing.T) { }, } pc, _ := webrtc.NewPeerConnection(config) - offer := deserializeSessionDescription(sampleOffer) + offer := util.DeserializeSessionDescription(sampleOffer) pc.SetRemoteDescription(*offer) answer, _ := pc.CreateAnswer(nil) pc.SetLocalDescription(answer) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 0b91059..264d4f2 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -4,7 +4,6 @@ import ( "bytes" "crypto/rand" "encoding/base64" - "encoding/json" "flag" "fmt" "io" @@ -21,6 +20,7 @@ import ( "git.torproject.org/pluggable-transports/snowflake.git/common/messages" "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" + "git.torproject.org/pluggable-transports/snowflake.git/common/util" "git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn" "github.com/gorilla/websocket" "github.com/pion/webrtc/v2" @@ -199,7 +199,7 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription { return nil } if offer != "" { - return deserializeSessionDescription(offer) + return util.DeserializeSessionDescription(offer) } } } @@ -209,7 +209,7 @@ func (b *Broker) pollOffer(sid string) *webrtc.SessionDescription { func (b *Broker) sendAnswer(sid string, pc *webrtc.PeerConnection) error { brokerPath := b.url.ResolveReference(&url.URL{Path: "answer"}) - answer := string([]byte(serializeSessionDescription(pc.LocalDescription()))) + answer := string([]byte(util.SerializeSessionDescription(pc.LocalDescription()))) body, err := messages.EncodeAnswerRequest(answer, sid) if err != nil { return err @@ -465,49 +465,3 @@ func main() { runSession(sessionID) } } - -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 - } - - 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) -}

1 0

[doctor/master] Send relay check notifications to me
by atagar＠torproject.org 17 Mar '20

17 Mar '20

commit 890e69dfe951211d955ef1875fb1f93babdf99c4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 17 14:05:04 2020 -0700 Send relay check notifications to me Oops! Georg shouldn't get these notifications. This script is a health check for my personal relay. --- relay_check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/relay_check.py b/relay_check.py index 9479022..c9e4878 100755 --- a/relay_check.py +++ b/relay_check.py @@ -21,7 +21,7 @@ RELAY_OR_PORT = 1443 RELAY_NAME = 'caersidi' RELAY_FINGERPRINT = '3BB34C63072D9D10E836EE42968713F7B9325F66' -EMAIL_ADDRESS = 'gk(a)torproject.org' +EMAIL_ADDRESS = 'atagar(a)torproject.org' RELAY_LINK = 'https://metrics.torproject.org/rs.html#details/%s' % RELAY_FINGERPRINT

1 0

[snowflake/master] Update go.mod and go.sum
by cohosh＠torproject.org 17 Mar '20

17 Mar '20

commit c11461d3391febd62ba5f7fb5517aa65dbcf5c59 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Mar 17 14:22:20 2020 -0400 Update go.mod and go.sum --- go.mod | 4 ++-- go.sum | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index d01fb0b..b203976 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.13 require ( git.torproject.org/pluggable-transports/goptlib.git v1.1.0 github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 + github.com/golang/protobuf v1.3.1 // indirect github.com/gorilla/websocket v1.4.1 - github.com/keroserene/go-webrtc v0.0.0-20190528223128-68a6fb1b4353 github.com/pion/sdp/v2 v2.3.4 github.com/pion/webrtc/v2 v2.2.2 github.com/smartystreets/goconvey v1.6.4 golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa - google.golang.org/appengine v1.6.5 + golang.org/x/text v0.3.2 // indirect ) diff --git a/go.sum b/go.sum index a62b8a9..af45818 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/keroserene/go-webrtc v0.0.0-20190528223128-68a6fb1b4353 h1:UVuvNMp4EiqRl2jDS0MchQmfolWCGzG9+y6vBy9S/aw= -github.com/keroserene/go-webrtc v0.0.0-20190528223128-68a6fb1b4353/go.mod h1:Wl6nMWlHBurzYryPggNZfgTsvRaAH2P3Q6alLg3VxLA= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -93,7 +91,6 @@ golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -112,8 +109,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 17 Mar '20

17 Mar '20

commit cc4d3c264bd2bc88dafb55c0bdeed5d5734cbb0d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 17 19:16:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- ja/https-everywhere.dtd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index e8814a8c51..4ed828a164 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -29,6 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed ""> <!ENTITY https-everywhere.options.disabledUrlsListed ""> <!ENTITY https-everywhere.options.updateChannelsWarning ""> +<!ENTITY https-everywhere.options.addDisabledSite ""> +<!ENTITY https-everywhere.options.enterDisabledSite ""> <!ENTITY https-everywhere.options.addUpdateChannel ""> <!ENTITY https-everywhere.options.enterUpdateChannelName ""> <!ENTITY https-everywhere.options.delete ""> @@ -47,6 +49,12 @@ <!ENTITY https-everywhere.cancel.open_page ""> <!ENTITY https-everywhere.cancel.http_once ""> +<!ENTITY https-everywhere.onboarding.intro ""> +<!ENTITY https-everywhere.onboarding.header ""> +<!ENTITY https-everywhere.onboarding.details_one ""> +<!ENTITY https-everywhere.onboarding.details_two ""> +<!ENTITY https-everywhere.onboarding.footer ""> + <!ENTITY https-everywhere.chrome.settings_for_this_site_header ""> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader ""> <!ENTITY https-everywhere.chrome.settings_for_this_site_explained "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 17 Mar '20

17 Mar '20

commit b2289901b691caabc68a435de04fbda3857d205f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 17 19:16:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- ja/https-everywhere.dtd | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd index f46a6a5d56..1d13c27ba1 100644 --- a/ja/https-everywhere.dtd +++ b/ja/https-everywhere.dtd @@ -6,9 +6,9 @@ <!ENTITY https-everywhere.about.add_new_rule "新しいルールの追加"> <!ENTITY https-everywhere.menu.donate_eff_imperative "EFF に寄付する"> -<!ENTITY https-everywhere.menu.observatory "SSL Observatoryの設定"> -<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhereは無効です"> -<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhereは有効です"> +<!ENTITY https-everywhere.menu.observatory "SSL Observatory の設定"> +<!ENTITY https-everywhere.menu.globalDisable "HTTPS Everywhere は無効です"> +<!ENTITY https-everywhere.menu.globalEnable "HTTPS Everywhere は有効です"> <!ENTITY https-everywhere.menu.encryptAllSitesEligibleOn "「すべてのサイトを暗号化」は有効です"> <!ENTITY https-everywhere.menu.encryptAllSitesEligibleOff "「すべてのサイトを暗号化」は無効です"> <!ENTITY https-everywhere.menu.httpNoWhereExplainedBlocked "非暗号化リクエストは現在ブロックされます"> @@ -27,16 +27,16 @@ <!ENTITY https-everywhere.options.showDevtoolsTab "デベロッパー・ツールのタブを表示する"> <!ENTITY https-everywhere.options.autoUpdateRulesets "ルールセットを自動更新する"> <!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere ユーザールール"> -<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhereが無効されたサイト"> +<!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere を無効化するサイト"> <!ENTITY https-everywhere.options.updateChannelsWarning "警告: 更新チャンネルを追加すると、攻撃者にブラウザを乗っ取られる可能性があります。十分な理解の上で、この項目を編集してください！"> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "無効化するサイトを追加"> +<!ENTITY https-everywhere.options.enterDisabledSite "無効化するサイト..."> <!ENTITY https-everywhere.options.addUpdateChannel "更新チャンネルを追加"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "更新チャンネル名を入力"> +<!ENTITY https-everywhere.options.enterUpdateChannelName "更新チャンネル名..."> <!ENTITY https-everywhere.options.delete "削除"> -<!ENTITY https-everywhere.options.update "アップデート"> +<!ENTITY https-everywhere.options.update "更新"> <!ENTITY https-everywhere.options.storedRulesetsVersion "保存中のルールセットバージョン: "> -<!ENTITY https-everywhere.options.updatesLastChecked "アップデートの最終確認:"> +<!ENTITY https-everywhere.options.updatesLastChecked "更新の最終確認:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "永遠"> <!ENTITY https-everywhere.options.debuggingRulesets "デバックルールセット(詳細)"> @@ -44,16 +44,16 @@ <!ENTITY https-everywhere.prefs.reset_defaults "デフォルトにリセット"> <!ENTITY https-everywhere.prefs.reset_defaults_message "これはルールセットをデフォルト状態にリセットします。つづきますか？"> -<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPSでないサイトにアクセスしようとしたことをHTTPS Everywhereが検知したため、代わりにHTTPSバージョンのサイトへの接続を試みましたが、HTTPSバージョンは利用できませんでした。おそらくこのサイトはHTTPSをサポートしていないと思われますが、攻撃者がHTTPSバージョンのサイトをブロックしている可能性もあります。このページの暗号化されてないバージョンを表示したい場合には、HTTPS Everywhereの機能「すべてのサイトを暗号化(EASE)」を無効にすることもできます。ただし、この機能を無効にすると、ブラウザをネットワークベースのダウングレード攻撃に対して無防備にすることにご留意ください。"> -<!ENTITY https-everywhere.cancel.he_blocking_network " ネットワーク基盤のダウングレード攻撃"> +<!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS でないサイトにアクセスしようとしたことを HTTPS Everywhere が検知したため、代わりに HTTPS バージョンのサイトへの接続を試みましたが、 HTTPS バージョンは利用できませんでした。おそらくこのサイトは HTTPS をサポートしていないと思われますが、攻撃者が HTTPS バージョンのサイトをブロックしている可能性もあります。このページの暗号化されてないバージョンを表示したい場合には、 HTTPS Everywhere の機能「すべてのサイトを暗号化(EASE)」を無効にすることもできます。ただし、この機能を無効にすると、ブラウザをネットワークベースのダウングレード攻撃に対して無防備にすることにご留意ください。"> +<!ENTITY https-everywhere.cancel.he_blocking_network "ネットワークベースのダウングレード攻撃"> <!ENTITY https-everywhere.cancel.open_page "安全でないページを開く"> <!ENTITY https-everywhere.cancel.http_once "このセッションでのみ安全でないページを開く"> -<!ENTITY https-everywhere.onboarding.intro "ウェブを暗号化します！多くのウェブサイト上でHTTPSセキュリティを自動的にかけます。"> -<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere has been updated!"> +<!ENTITY https-everywhere.onboarding.intro "ウェブを暗号化します！多くのウェブサイト上で HTTPS セキュリティを自動的に有効にします。"> +<!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere は更新されました！"> <!ENTITY https-everywhere.onboarding.details_one "「すべてのサイトを暗号化(EASE)」モードの最適化"> -<!ENTITY https-everywhere.onboarding.details_two "You can now whitelist sites to disable in HTTPS Everywhere"> -<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere is an EFF project"> +<!ENTITY https-everywhere.onboarding.details_two "HTTPS Everywhere を無効化するサイトを追加できます"> +<!ENTITY https-everywhere.onboarding.footer "HTTPS Everywhere は電子フロンティア財団(EFF)のプロジェクトです"> <!ENTITY https-everywhere.chrome.settings_for_this_site_header "このサイトの設定"> <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "暗号化された接続の設定を変更"> @@ -66,7 +66,7 @@ <!ENTITY https-everywhere.chrome.enable_on_this_site "このサイトでは HTTPS Everywhere を有効にする"> <!ENTITY https-everywhere.chrome.add_rule "このサイトへのルールの追加"> <!ENTITY https-everywhere.chrome.add_new_rule "このサイトへの新しいルールの追加"> -<!ENTITY https-everywhere.chrome.always_https_for_host "このホストでは常にhttpsを使用する"> +<!ENTITY https-everywhere.chrome.always_https_for_host "このホストでは常に HTTPS を使用する"> <!ENTITY https-everywhere.chrome.host "ホスト:"> <!ENTITY https-everywhere.chrome.show_advanced "高度な設定を表示する"> <!ENTITY https-everywhere.chrome.hide_advanced "高度な設定を隠す">

1 0

[tor/release-0.4.1] Construct initial 0.4.1.9 changelog.
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 14a5ea2456e92ce6a8350398bf5400c76fdc6239 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 14:51:42 2020 -0400 Construct initial 0.4.1.9 changelog. --- ChangeLog | 46 ++++++++++++++++++++++++++++++++++++++++++++++ changes/bug32753 | 3 --- changes/bug33093_logging | 5 ----- changes/ticket32792 | 3 --- changes/ticket33075 | 4 ---- changes/ticket33194 | 4 ---- changes/ticket33195 | 4 ---- changes/ticket33212 | 4 ---- changes/ticket33619 | 5 ----- changes/trove_2020_003 | 4 ---- 10 files changed, 46 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac10a79bb..ee9440f32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +Changes in version 0.4.1.9 - 2020-03-?? + Blurb. + + o Major bugfixes (circuit padding, memory leak, backport from 0.4.3.3-alpha): + - Avoid a remotely triggered memory leak in the case that a circuit + padding machine is somehow negotiated twice on the same circuit. + Fixes bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. + This is also tracked as TROVE-2020-004. + + o Minor bugfixes (bridges, backport from 0.4.3.1-alpha): + - Lowercase the configured value of BridgeDistribution before adding + it to the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. + + o Minor bugfixes (hidden services v3, backport from 0.4.3.3-alpha): + - Fix an assertion failure that could result from a corrupted + ADD_ONION control port command. Found by Saibato. Fixes bug 33137; + bugfix on 0.3.3.1-alpha. This issue is also tracked + as TROVE-2020-003. + + o Minor bugfixes (logging, backport from 0.4.3.2-alpha): + - If we encounter a bug when flushing a buffer to a TLS connection, + only log the bug once per invocation of the Tor process. + Previously we would log with every occurrence, which could cause + us to run out of disk space. Fixes bug 33093; bugfix + on 0.3.2.2-alpha. + + o Minor bugfixes (rust, build, backport from 0.4.3.2-alpha): + - Fix a syntax warning given by newer versions of Rust that was + creating problems for our continuous integration. Fixes bug 33212; + bugfix on 0.3.5.1-alpha. + - Fix a syntax warning given by newer versions of Rust that was + creating problems for our continuous integration. Fixes bug 33212; + bugfix on 0.3.5.1-alpha. + + o Testing (Travis CI, backport from 0.4.3.3-alpha): + - Remove a redundant distcheck job. Closes ticket 33194. + - Sort the Travis jobs in order of speed: putting the slowest jobs + first takes full advantage of Travis job concurrency. Closes + ticket 33194. + - Stop allowing the Chutney IPv6 Travis job to fail. This job was + previously configured to fast_finish (which requires + allow_failure), to speed up the build. Closes ticket 33195. + - When a Travis chutney job fails, use chutney's new "diagnostics.sh" + tool to produce detailed diagnostic output. Closes ticket 32792. + + Changes in version 0.4.1.8 - 2020-01-30 This release backports several bugfixes from later release series, including some that had affected the Linux seccomp2 sandbox or Windows diff --git a/changes/bug32753 b/changes/bug32753 deleted file mode 100644 index 6f59c7729..000000000 --- a/changes/bug32753 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (bridges): - - Lowercase the value of BridgeDistribution from torrc before adding it to - the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. diff --git a/changes/bug33093_logging b/changes/bug33093_logging deleted file mode 100644 index e26e4a64a..000000000 --- a/changes/bug33093_logging +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (logging): - - If we encounter a bug when flushing a buffer to a TLS connection, - only log the bug once per invocation of the Tor process. Previously we - would log with every occurrence, which could cause us to run out of - disk space. Fixes bug 33093; bugfix on 0.3.2.2-alpha. diff --git a/changes/ticket32792 b/changes/ticket32792 deleted file mode 100644 index 553cf0ca8..000000000 --- a/changes/ticket32792 +++ /dev/null @@ -1,3 +0,0 @@ - o Testing: - - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool - to produce detailed diagnostic output. Closes ticket 32792. diff --git a/changes/ticket33075 b/changes/ticket33075 deleted file mode 100644 index 69698d90b..000000000 --- a/changes/ticket33075 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Stop allowing failures on the Travis CI stem tests job. It looks like all - the stem hangs we were seeing are now fixed, but let's make sure we see - them if they happen again. Closes ticket 33075. diff --git a/changes/ticket33194 b/changes/ticket33194 deleted file mode 100644 index b87e55348..000000000 --- a/changes/ticket33194 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Remove a redundant distcheck job. Closes ticket 33194. - - Sort the Travis jobs in order of speed. Putting the slowest jobs first - takes full advantage of Travis job concurrency. Closes ticket 33194. diff --git a/changes/ticket33195 b/changes/ticket33195 deleted file mode 100644 index 11abd4816..000000000 --- a/changes/ticket33195 +++ /dev/null @@ -1,4 +0,0 @@ - o Testing: - - Stop allowing the Chutney IPv6 Travis job to fail. This job was - previously configured to fast_finish (which requires allow_failure), to - speed up the build. Closes ticket 33195. diff --git a/changes/ticket33212 b/changes/ticket33212 deleted file mode 100644 index aeb09e0c6..000000000 --- a/changes/ticket33212 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (rust, build): - - Fix a syntax warning given by newer versions of Rust, and creating - problems for our continuous integration. - Fixes bug 33212; bugfix on 0.3.5.1-alpha. diff --git a/changes/ticket33619 b/changes/ticket33619 deleted file mode 100644 index 3c52858b3..000000000 --- a/changes/ticket33619 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes (circuit padding, memory leaks): - - Avoid a remotely triggered memory leak in the case that a circuit - padding machine is somehow negotiated twice on the same circuit. Fixes - bug 33619; bugfix on 0.4.0.1-alpha. Found by Tobias Pulls. This is - also tracked as TROVE-2020-004. diff --git a/changes/trove_2020_003 b/changes/trove_2020_003 deleted file mode 100644 index aa1a8f1c7..000000000 --- a/changes/trove_2020_003 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (onion services v3): - - Fix assertion failure that could result from a corrupted ADD_ONION control - port command. Found by Saibato. Fixes bug 33137; bugfix on - 0.3.3.1-alpha. This issue is also being tracked as TROVE-2020-003.

1 0

[tor/release-0.4.1] Light changelog edits
by nickm＠torproject.org 17 Mar '20

17 Mar '20

commit 055c5732c4d765f5da7fc34353f0488b505b1f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 17 15:03:03 2020 -0400 Light changelog edits --- ChangeLog | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee9440f32..116684cb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,7 @@ Changes in version 0.4.1.9 - 2020-03-?? - Lowercase the configured value of BridgeDistribution before adding it to the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. - o Minor bugfixes (hidden services v3, backport from 0.4.3.3-alpha): + o Minor bugfixes (onion services v3, backport from 0.4.3.3-alpha): - Fix an assertion failure that could result from a corrupted ADD_ONION control port command. Found by Saibato. Fixes bug 33137; bugfix on 0.3.3.1-alpha. This issue is also tracked @@ -28,9 +28,6 @@ Changes in version 0.4.1.9 - 2020-03-?? - Fix a syntax warning given by newer versions of Rust that was creating problems for our continuous integration. Fixes bug 33212; bugfix on 0.3.5.1-alpha. - - Fix a syntax warning given by newer versions of Rust that was - creating problems for our continuous integration. Fixes bug 33212; - bugfix on 0.3.5.1-alpha. o Testing (Travis CI, backport from 0.4.3.3-alpha): - Remove a redundant distcheck job. Closes ticket 33194.

1 0