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

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 09 Mar '20

09 Mar '20

commit b6c7c2e0917f4ec5365295824fe2cf12b2b930d8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 9 17:20:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+nl.po | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index 9545dd6dc5..210c737a86 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -554,6 +554,8 @@ msgid "" "When you run Tor Browser for the first time, you will see the Tor Network " "Settings window." msgstr "" +"Wanneer u Tor Browser voor de eerste keer uitvoert, ziet u het venster met " +"Tor Netwerkinstellingen." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -561,6 +563,8 @@ msgid "" "This offers you the option to connect directly to the Tor network, or to " "configure Tor Browser for your connection." msgstr "" +"Dit biedt u de mogelijkheid om direct verbinding te maken met het Tor " +"netwerk, of om Tor Browser te configureren voor uw verbinding." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -580,12 +584,16 @@ msgid "" "In most cases, choosing \"Connect\" will allow you to connect to the Tor " "network without any further configuration." msgstr "" +"In de meeste gevallen kunt u door te kiezen voor \"Verbinden\" een " +"verbinding maken met het Tor-netwerk zonder verdere configuratie." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "" "Once clicked, a status bar will appear, showing Tor’s connection progress." msgstr "" +"Eenmaal geklikt, verschijnt er een statusbalk die de voortgang van de " +"verbinding van Tor laat zien." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -594,6 +602,9 @@ msgid "" "at a certain point, see the [Troubleshooting](/troubleshooting) page for " "help solving the problem." msgstr "" +"Als u op een relatief snelle verbinding zit, maar deze balk lijkt op een " +"gegeven moment vast te zitten, zie dan de pagina [Problemen " +"oplossen](/probleemoplossing) voor hulp bij het oplossen van het probleem." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -626,6 +637,13 @@ msgid "" " You will then be taken to the [Circumvention](/circumvention) screen to " "configure a pluggable transport." msgstr "" +"Het eerste scherm vraagt of de toegang tot het Tor-netwerk geblokkeerd of " +"gecensureerd is op je verbinding. Als je niet gelooft dat dit het geval is, " +"selecteer dan \"Nee\". Als je weet dat je verbinding gecensureerd is, of u " +"hebt geprobeerd en gefaald om verbinding te maken met het Tor netwerk en " +"geen andere oplossingen hebben gewerkt, selecteer dan \"Ja\". Je wordt dan " +"naar het [Circumvention](/circumvention) scherm gebracht om een aansluitbaar" +" transport te configureren." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -677,11 +695,13 @@ msgid "" "Tor Browser includes some circumvention tools for getting around these " "blocks. These tools are called “pluggable transports”." msgstr "" +"Tor Browser bevat enkele omzeilingshulpmiddelen om deze blokkades te " +"omzeilen. Deze tools worden \"pluggable transports\" genoemd." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### SOORTEN VAN PLUGGABLE TRANSPORT" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -689,6 +709,8 @@ msgid "" "Currently there are three pluggable transports available, but more are being" " developed." msgstr "" +"Op dit moment zijn er drie pluggable transporten beschikbaar, maar er worden" +" er nog meer ontwikkeld." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -739,7 +761,7 @@ msgstr "</tr>" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "meek" -msgstr "meek" +msgstr "bescheiden" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -748,6 +770,10 @@ msgid "" "instead of using Tor. meek-azure makes it look like you are using a " "Microsoft web site." msgstr "" +"De bescheidenheid van de transporten zorgt ervoor dat het lijkt alsof je een" +" grote website bezoekt in plaats van Tor. De bescheidenheid van de " +"transporten zorgt ervoor dat het lijkt alsof je een Microsoft-website " +"gebruikt." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 09 Mar '20

09 Mar '20

commit cbd8a7b77aa64b614fc722ec34943161e89007d3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 9 16:51:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nl/torbutton.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/torbutton.properties b/nl/torbutton.properties index d2b7334a65..ca255b7b0b 100644 --- a/nl/torbutton.properties +++ b/nl/torbutton.properties @@ -69,10 +69,10 @@ onionServices.authPrompt.done=Gereed onionServices.authPrompt.doneAccessKey=G onionServices.authPrompt.invalidKey=Voer een geldige sleutel in (52 base32-tekens of 44 base64-tekens) onionServices.authPrompt.failedToSetKey=Kan Tor niet configureren met uw sleutel -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.header=Onion diensten Authenticatie +onionServices.authPreferences.overview=Voor sommige Onion diensten moet u zich identificeren met een sleutel (een soort wachtwoord) voordat u toegang kunt krijgen. onionServices.authPreferences.savedKeys=Opgeslagen sleutels… -onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogTitle=Onion Service sleutels onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer onionServices.authPreferences.onionSite=Onionsite onionServices.authPreferences.onionKey=Sleutel

1 0

[translation/policies-code_of_conducttxtpot] https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
by translation＠torproject.org 09 Mar '20

09 Mar '20

commit 65a2f2aeac0534cd648d696e3f4130984a02db12 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 9 16:47:03 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_co… --- code_of_conduct+nl.po | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/code_of_conduct+nl.po b/code_of_conduct+nl.po index d6df16f3d6..9aee16bf36 100644 --- a/code_of_conduct+nl.po +++ b/code_of_conduct+nl.po @@ -8,7 +8,7 @@ # kwadronaut <kwadronaut(a)autistici.org>, 2019 # Meteor0id, 2019 # Tonnes <tonnes.mb(a)gmail.com>, 2020 -# John Falter <johnfalter9(a)gmail.com>, 2020 +# John Falter, 2020 # #, fuzzy msgid "" @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: Code of conduct of the Tor Project\n" "POT-Creation-Date: 2019-08-02 12:00+0000\n" "PO-Revision-Date: 2019-08-27 18:54+0000\n" -"Last-Translator: John Falter <johnfalter9(a)gmail.com>, 2020\n" +"Last-Translator: John Falter, 2020\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -684,6 +684,14 @@ msgid "" "format. The next steps in an incident response will vary on a case-by-case " "basis." msgstr "" +"De gemeenschapsraad geeft prioriteit aan de veiligheid en het welzijn van " +"een ieder die zich benadeeld voelt of het risico loopt benadeeld te worden. " +"Iedereen die een kwestie aan de gemeenschapsraad rapporteert, mag verwachten" +" dat zijn rapport serieus wordt genomen. De eerste meldingen kunnen " +"schriftelijk of mondeling worden gedaan. Indien het incident niet " +"onmiddellijk opgelost hoeft te worden, kan een schriftelijk rapport in " +"gecodeerde vorm met de gemeenschapsraad worden gedeeld. De volgende stappen " +"in de reactie op een incident zullen van geval tot geval verschillen." #. type: Plain text #: ../code_of_conduct.txt:245 @@ -705,6 +713,13 @@ msgid "" "appealed by following the appeals process in the Community Council " "Guidelines [1]." msgstr "" +"Als een lid van de gemeenschap zich schuldig maakt aan onaanvaardbaar " +"gedrag, kan de gemeenschapsraad elke actie ondernemen die hij passend acht, " +"met inbegrip van maar niet beperkt tot een waarschuwing, informele " +"bemiddeling, tijdelijk verbod of permanente uitzetting uit de gemeenschap. " +"Tegen alle acties en besluiten van de gemeenschapsraad kan beroep worden " +"aangetekend door de beroepsprocedure in de richtlijnen van de " +"gemeenschapsraad te volgen [1]." #. type: Plain text #: ../code_of_conduct.txt:255

1 0

[metrics-web/master] Add icon for StaleDesc flag.
by karsten＠torproject.org 09 Mar '20

09 Mar '20

commit cff715e3887ebf960290bc8fc7195614c4b93d9b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Mar 9 17:31:41 2020 +0100 Add icon for StaleDesc flag. The new icon is based on clock, solid style in Font Awesome Free 5.21.1. It was converted using Inkscape 0.92.4 using the command: `inkscape -z -e clock.png -w 16 -h 16 clock.svg`. Fixes #33453. --- src/main/resources/web/images/flags/staledesc.png | Bin 0 -> 345 bytes src/main/resources/web/js/rs/models/relay.js | 3 +++ 2 files changed, 3 insertions(+) diff --git a/src/main/resources/web/images/flags/staledesc.png b/src/main/resources/web/images/flags/staledesc.png new file mode 100644 index 0000000..bb9faf0 Binary files /dev/null and b/src/main/resources/web/images/flags/staledesc.png differ diff --git a/src/main/resources/web/js/rs/models/relay.js b/src/main/resources/web/js/rs/models/relay.js index 11d98fc..60316b8 100644 --- a/src/main/resources/web/js/rs/models/relay.js +++ b/src/main/resources/web/js/rs/models/relay.js @@ -43,6 +43,9 @@ define([ if (flag == "Stable") { output.push([flag, "stable", "This relay is suitable for long-lived circuits."]); } + if (flag == "StaleDesc") { + output.push([flag, "staledesc", "This relay should upload a new descriptor because the old one is too old."]); + } if (flag == "V2Dir") { output.push([flag, "v2dir", "This relay implements the v2 directory protocol or higher."]); }

1 0

[snowflake/master] Add a go.mod and go.sum for snowflake
by cohosh＠torproject.org 09 Mar '20

09 Mar '20

commit 920f6791f3ec8e7467c43ee0cefffe63200bed2b Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 2 14:16:19 2020 -0500 Add a go.mod and go.sum for snowflake --- client/lib/lib_test.go | 2 +- client/lib/rendezvous.go | 4 +- client/lib/util.go | 2 +- client/lib/webrtc.go | 2 +- client/snowflake.go | 2 +- go.mod | 16 ++++++ go.sum | 126 ++++++++++++++++++++++++++++++++++++++++++++++ proxy-go/proxy-go_test.go | 2 +- proxy-go/snowflake.go | 2 +- 9 files changed, 150 insertions(+), 8 deletions(-) diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go index b413508..a0e77cb 100644 --- a/client/lib/lib_test.go +++ b/client/lib/lib_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/pion/webrtc" + "github.com/pion/webrtc/v2" . "github.com/smartystreets/goconvey/convey" ) diff --git a/client/lib/rendezvous.go b/client/lib/rendezvous.go index 17c024f..d35c813 100644 --- a/client/lib/rendezvous.go +++ b/client/lib/rendezvous.go @@ -18,8 +18,8 @@ import ( "net/http" "net/url" - "github.com/pion/sdp" - "github.com/pion/webrtc" + "github.com/pion/sdp/v2" + "github.com/pion/webrtc/v2" ) const ( diff --git a/client/lib/util.go b/client/lib/util.go index f93bcbe..1b5f592 100644 --- a/client/lib/util.go +++ b/client/lib/util.go @@ -5,7 +5,7 @@ import ( "log" "time" - "github.com/pion/webrtc" + "github.com/pion/webrtc/v2" ) const ( diff --git a/client/lib/webrtc.go b/client/lib/webrtc.go index 8e06d98..0b3bb16 100644 --- a/client/lib/webrtc.go +++ b/client/lib/webrtc.go @@ -9,7 +9,7 @@ import ( "time" "github.com/dchest/uniuri" - "github.com/pion/webrtc" + "github.com/pion/webrtc/v2" ) // Remote WebRTC peer. diff --git a/client/snowflake.go b/client/snowflake.go index 7cf8a9d..4076fff 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -17,7 +17,7 @@ import ( pt "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/pion/webrtc" + "github.com/pion/webrtc/v2" ) const ( diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..d01fb0b --- /dev/null +++ b/go.mod @@ -0,0 +1,16 @@ +module git.torproject.org/pluggable-transports/snowflake.git + +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/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 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..a62b8a9 --- /dev/null +++ b/go.sum @@ -0,0 +1,126 @@ +git.torproject.org/pluggable-transports/goptlib.git v1.1.0 h1:LMQAA8pAho+QtYrrVNimJQiINNEwcwuuD99vezD/PAo= +git.torproject.org/pluggable-transports/goptlib.git v1.1.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q= +github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5 h1:RAV05c0xOkJ3dZGS0JFybxFKZ2WMLabgx3uXnd7rpGs= +github.com/dchest/uniuri v0.0.0-20200228104902-7aecb25e1fe5/go.mod h1:GgB8SF9nRG+GqaDtLcwJZsQFhcogVCJ79j4EdT0c2V4= +github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +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= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9 h1:tbuodUh2vuhOVZAdW3NEUvosFHUMJwUNl7jk/VSEiwc= +github.com/lucas-clemente/quic-go v0.7.1-0.20190401152353-907071221cf9/go.mod h1:PpMmPfPKO9nKJ/psF49ESTAGQSdfXxlg1otPbEB2nOw= +github.com/marten-seemann/qtls v0.2.3 h1:0yWJ43C62LsZt08vuQJDK1uC1czUc3FJeCLPoNAI4vA= +github.com/marten-seemann/qtls v0.2.3/go.mod h1:xzjG7avBwGGbdZ8dTGxlBnLArsVKLvwmjgmPuiQEcYk= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/pion/datachannel v1.4.15 h1:DrizUL97f9evDyoskyMLrFFFmOWCfXFGiGSbxmQyYt4= +github.com/pion/datachannel v1.4.15/go.mod h1:yixWvOWPime7vRVuihP1GzZPBELQkO/ZM1mrBc2BNM8= +github.com/pion/dtls/v2 v2.0.0-rc.7 h1:LDAIQDt1pcuAIJs7Q2EZ3PSl8MseCFA2nCW0YYSYCx0= +github.com/pion/dtls/v2 v2.0.0-rc.7/go.mod h1:U199DvHpRBN0muE9+tVN4TMy1jvEhZIZ63lk4xkvVSk= +github.com/pion/ice v0.7.9 h1:RKol/0RFu3TIE8ZLIFV1A1e/QW22B6BZKvSG9sfawEM= +github.com/pion/ice v0.7.9/go.mod h1:8BCwuq/EqAKhtUb8CIw2fWjVLotWOu13XJY09H3RVxA= +github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= +github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= +github.com/pion/mdns v0.0.4 h1:O4vvVqr4DGX63vzmO6Fw9vpy3lfztVWHGCQfyw0ZLSY= +github.com/pion/mdns v0.0.4/go.mod h1:R1sL0p50l42S5lJs91oNdUL58nm0QHrhxnSegr++qC0= +github.com/pion/quic v0.1.1 h1:D951FV+TOqI9A0rTF7tHx0Loooqz+nyzjEyj8o3PuMA= +github.com/pion/quic v0.1.1/go.mod h1:zEU51v7ru8Mp4AUBJvj6psrSth5eEFNnVQK5K48oV3k= +github.com/pion/rtcp v1.2.1 h1:S3yG4KpYAiSmBVqKAfgRa5JdwBNj4zK3RLUa8JYdhak= +github.com/pion/rtcp v1.2.1/go.mod h1:a5dj2d6BKIKHl43EnAOIrCczcjESrtPuMgfmL6/K6QM= +github.com/pion/rtp v1.3.0/go.mod h1:q9wPnA96pu2urCcW/sK/RiDn597bhGoAQQ+y2fDwHuY= +github.com/pion/rtp v1.3.2 h1:Yfzf1mU4Zmg7XWHitzYe2i+l+c68iO+wshzIUW44p1c= +github.com/pion/rtp v1.3.2/go.mod h1:q9wPnA96pu2urCcW/sK/RiDn597bhGoAQQ+y2fDwHuY= +github.com/pion/sctp v1.7.5 h1:ognJDlxP7dN2xMUEHEea5pqjdD78o5UAMcLoP1JIp1g= +github.com/pion/sctp v1.7.5/go.mod h1:ichkYQ5tlgCQwEwvgfdcAolqx1nHbYCxo4D7zK/K0X8= +github.com/pion/sdp/v2 v2.3.4 h1:+f3F5Xl7ynVhc9Il8Dc7BFroYJWG3PMbfWtwFlVI+kg= +github.com/pion/sdp/v2 v2.3.4/go.mod h1:jccXVYW0fuK6ds2pwKr89SVBDYlCjhgMI6nucl5R5rA= +github.com/pion/srtp v1.2.7 h1:UYyLs5MXwbFtXWduBA5+RUWhaEBX7GmetXDZSKP+uPM= +github.com/pion/srtp v1.2.7/go.mod h1:KIgLSadhg/ioogO/LqIkRjZrwuJo0c9RvKIaGQj4Yew= +github.com/pion/stun v0.3.3 h1:brYuPl9bN9w/VM7OdNzRSLoqsnwlyNvD9MVeJrHjDQw= +github.com/pion/stun v0.3.3/go.mod h1:xrCld6XM+6GWDZdvjPlLMsTU21rNxnO6UO8XsAvHr/M= +github.com/pion/transport v0.6.0/go.mod h1:iWZ07doqOosSLMhZ+FXUTq+TamDoXSllxpbGcfkCmbE= +github.com/pion/transport v0.8.10 h1:lTiobMEw2PG6BH/mgIVqTV2mBp/mPT+IJLaN8ZxgdHk= +github.com/pion/transport v0.8.10/go.mod h1:tBmha/UCjpum5hqTWhfAEs3CO4/tHSg0MYRhSzR+CZ8= +github.com/pion/turn/v2 v2.0.3 h1:SJUUIbcPoehlyZgMyIUbBBDhI03sBx32x3JuSIBKBWA= +github.com/pion/turn/v2 v2.0.3/go.mod h1:kl1hmT3NxcLynpXVnwJgObL8C9NaCyPTeqI2DcCpSZs= +github.com/pion/webrtc/v2 v2.2.2 h1:ace9itTe8YND8m3lv5ndQurfk/DsChj+4pBzVJeBA04= +github.com/pion/webrtc/v2 v2.2.2/go.mod h1:oftEPcdfIvZVC1J0VP1OpyVCwB9tDkRXSYAszkL/2k4= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d h1:9FCpayM9Egr1baVnV1SX0H87m+XB0B8S0hAMi99X/3U= +golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +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= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190228124157-a34e9553db1e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +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= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/proxy-go/proxy-go_test.go b/proxy-go/proxy-go_test.go index ebe4381..2429d1e 100644 --- a/proxy-go/proxy-go_test.go +++ b/proxy-go/proxy-go_test.go @@ -13,7 +13,7 @@ import ( "testing" "git.torproject.org/pluggable-transports/snowflake.git/common/messages" - "github.com/pion/webrtc" + "github.com/pion/webrtc/v2" . "github.com/smartystreets/goconvey/convey" ) diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go index 5e56842..0b91059 100644 --- a/proxy-go/snowflake.go +++ b/proxy-go/snowflake.go @@ -23,7 +23,7 @@ import ( "git.torproject.org/pluggable-transports/snowflake.git/common/safelog" "git.torproject.org/pluggable-transports/snowflake.git/common/websocketconn" "github.com/gorilla/websocket" - "github.com/pion/webrtc" + "github.com/pion/webrtc/v2" ) const defaultBrokerURL = "https://snowflake-broker.bamsoftware.com/"

1 0

[snowflake/master] Remove go get commands from travis.yml
by cohosh＠torproject.org 09 Mar '20

09 Mar '20

commit 58b52eb9f7987789d8e90a982a6df16013e200dd Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Mar 2 14:22:42 2020 -0500 Remove go get commands from travis.yml We no longer need standalone get commands now that we are using go modules. --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39e777a..56d612c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,14 +22,6 @@ before_install: - nvm install $TRAVIS_NODE_VERSION install: - - go get -u github.com/smartystreets/goconvey - - go get -u github.com/keroserene/go-webrtc - - go get -u github.com/pion/webrtc - - go get -u github.com/dchest/uniuri - - go get -u github.com/gorilla/websocket - - go get -u git.torproject.org/pluggable-transports/goptlib.git - - go get -u golang.org/x/crypto/acme/autocert - - go get -u golang.org/x/net/http2 - pushd proxy - npm install - popd

1 0

[tor/master] Merge branch 'tor-github/pr/1723'
by dgoulet＠torproject.org 09 Mar '20

09 Mar '20

commit 2d53168511eafe6ac28c38d3a6f95114af3ee7b3 Merge: 6684c6e17 e849881d3 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Mar 9 10:36:05 2020 -0400 Merge branch 'tor-github/pr/1723' changes/bug33087 | 7 ++++++ configure.ac | 1 + src/lib/err/torerr.c | 26 ++++++++++----------- src/lib/err/torerr.h | 2 +- src/lib/err/torerr_sys.c | 6 ++--- src/lib/log/log.c | 60 +++++++++++++++++------------------------------- src/lib/log/log.h | 2 +- src/lib/log/util_bug.c | 2 +- 8 files changed, 46 insertions(+), 60 deletions(-)

1 0

[tor/master] Run "make autostyle"
by dgoulet＠torproject.org 09 Mar '20

09 Mar '20

commit e849881d3ad80e46bc4297d2cf9651f3f7d039cc Author: teor <teor(a)torproject.org> Date: Thu Feb 13 09:28:21 2020 +1000 Run "make autostyle" But only take the changes that were caused by the rest of the 33087 branch. Part of 33087. --- src/lib/err/torerr.c | 2 +- src/lib/log/log.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/err/torerr.c b/src/lib/err/torerr.c index c2dd862e1..2de75c0be 100644 --- a/src/lib/err/torerr.c +++ b/src/lib/err/torerr.c @@ -171,7 +171,7 @@ tor_log_flush_sigsafe_err_fds(void) * take any other action, if fsync() fails. */ (void)fsync(fds[i]); } -#endif +#endif /* defined(HAVE_FSYNC) */ } /** diff --git a/src/lib/log/log.c b/src/lib/log/log.c index cfb8f5b42..eb8151574 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -844,7 +844,7 @@ logs_flush_sigsafe(void) (void)fsync(victim->fd); } } -#endif +#endif /* defined(HAVE_FSYNC) */ } /** Remove and free the log entry <b>victim</b> from the linked-list

1 0

[tor/master] Merge branch 'bug33087_042' into bug33087_043
by dgoulet＠torproject.org 09 Mar '20

09 Mar '20

commit 4f533ed28b831eb794f562dac9add1dbf37f6335 Merge: 8a23393ed b6d1f99cb Author: teor <teor(a)torproject.org> Date: Thu Feb 13 00:02:11 2020 +1000 Merge branch 'bug33087_042' into bug33087_043 "ours" merge, because the 0.4.2 backport deletes the close functions. But the 0.4.3 bug fix replaces them with fsync() where available.

1 0

[tor/master] log: Stop duplicating error file fds
by dgoulet＠torproject.org 09 Mar '20

09 Mar '20

commit 8a23393eda00c7b7448b4d84157c5d06ba40c01c Author: teor <teor(a)torproject.org> Date: Wed Feb 12 13:11:57 2020 +1000 log: Stop duplicating error file fds Since we're not closing these fds, they don't need to be duplicated any more. Cleanup after 33087. --- src/lib/log/log.c | 41 ++++++++++++----------------------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/src/lib/log/log.c b/src/lib/log/log.c index 4813a4fae..cfb8f5b42 100644 --- a/src/lib/log/log.c +++ b/src/lib/log/log.c @@ -665,21 +665,15 @@ tor_log_update_sigsafe_err_fds(void) const logfile_t *lf; int found_real_stderr = 0; - /* log_fds and err_fds contain matching entries: log_fds are the fds used by - * the log module, and err_fds are the fds used by the err module. - * For stdio logs, the log_fd and err_fd values are identical. - * For file logs, the err_fd is a dup() of the log_fd. - * Both the log and err modules flush these fds on shutdown. - */ - int log_fds[TOR_SIGSAFE_LOG_MAX_FDS]; - int err_fds[TOR_SIGSAFE_LOG_MAX_FDS]; + /* The fds are the file descriptors of tor's stdout, stderr, and file + * logs. The log and err modules flush these fds during their shutdowns. */ + int fds[TOR_SIGSAFE_LOG_MAX_FDS]; int n_fds; LOCK_LOGS(); /* Reserve the first one for stderr. This is safe because when we daemonize, - * we dup2 /dev/null to stderr. - * For stderr, log_fds and err_fds are the same. */ - log_fds[0] = err_fds[0] = STDERR_FILENO; + * we dup2 /dev/null to stderr. */ + fds[0] = STDERR_FILENO; n_fds = 1; for (lf = logfiles; lf; lf = lf->next) { @@ -694,21 +688,11 @@ tor_log_update_sigsafe_err_fds(void) (LD_BUG|LD_GENERAL)) { if (lf->fd == STDERR_FILENO) found_real_stderr = 1; - /* Avoid duplicates by checking the log module fd against log_fds */ - if (int_array_contains(log_fds, n_fds, lf->fd)) + /* Avoid duplicates by checking the log module fd against fds */ + if (int_array_contains(fds, n_fds, lf->fd)) continue; - /* Update log_fds using the log module's fd */ - log_fds[n_fds] = lf->fd; - if (lf->needs_close) { - /* File log fds are duplicated, because close_log() closes the log - * module's fd, and tor_log_flush_sigsafe_err_fds() closes the err - * module's fd. Both refer to the same file. */ - err_fds[n_fds] = dup(lf->fd); - } else { - /* stdio log fds are not closed by the log module. - * tor_log_flush_sigsafe_err_fds() closes stdio logs. */ - err_fds[n_fds] = lf->fd; - } + /* Update fds using the log module's fd */ + fds[n_fds] = lf->fd; n_fds++; if (n_fds == TOR_SIGSAFE_LOG_MAX_FDS) break; @@ -716,20 +700,19 @@ tor_log_update_sigsafe_err_fds(void) } if (!found_real_stderr && - int_array_contains(log_fds, n_fds, STDOUT_FILENO)) { + int_array_contains(fds, n_fds, STDOUT_FILENO)) { /* Don't use a virtual stderr when we're also logging to stdout. * If we reached max_fds logs, we'll now have (max_fds - 1) logs. * That's ok, max_fds is large enough that most tor instances don't exceed * it. */ raw_assert(n_fds >= 2); /* Don't tor_assert inside log fns */ --n_fds; - log_fds[0] = log_fds[n_fds]; - err_fds[0] = err_fds[n_fds]; + fds[0] = fds[n_fds]; } UNLOCK_LOGS(); - tor_log_set_sigsafe_err_fds(err_fds, n_fds); + tor_log_set_sigsafe_err_fds(fds, n_fds); } /** Add to <b>out</b> a copy of every currently configured log file name. Used

1 0