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

[tor/maint-0.4.1] Merge branch 'tor-github/pr/1065' into maint-0.4.1
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit eab9dc06af32ceb3826d068cf5bc55db68ad6c61 Merge: 2779ce1f6 3c3158f18 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 13:48:10 2019 +0300 Merge branch 'tor-github/pr/1065' into maint-0.4.1 changes/bug22619 | 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12 +++++------- 3 files changed, 9 insertions(+), 8 deletions(-)

1 0

[tor/master] push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit bbddda3a185f507314f4f4d5e1a1060f3d9bc5e5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 08:56:26 2019 -0400 push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH We already allow this override in our pre-push hook, so let's allow it here too. (I call my upstream branches "origin") --- scripts/git/git-push-all.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 9e1b39c10..0701b27b5 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,9 +1,9 @@ #!/bin/bash # The remote upstream branch on which git.torproject.org/tor.git points to. -UPSTREAM_BRANCH="upstream" +UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} -git push $UPSTREAM_BRANCH \ +git push "$UPSTREAM_BRANCH" \ master \ {release,maint}-0.4.1 \ {release,maint}-0.4.0 \

1 0

[tor/master] Update git scripts for new versions
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 46da530431d340cde22192d9df475d85b5d9fab7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 08:54:22 2019 -0400 Update git scripts for new versions {maint,release}-0.4.1 are now real {maint,release}-0.3.4 are now EOL Closes ticket 30822 --- scripts/git/git-merge-forward.sh | 18 +++++++++--------- scripts/git/git-pull-all.sh | 14 +++++++------- scripts/git/git-push-all.sh | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 67af7e98b..98ad07c9c 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -38,15 +38,15 @@ TOR_WKT_NAME="tor-wkt" # # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. -MAINT_034=( "maint-0.3.4" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" ) -MAINT_035=( "maint-0.3.5" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) +MAINT_035=( "maint-0.3.5" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) -MAINT_MASTER=( "master" "maint-0.4.0" "$GIT_PATH/$TOR_MASTER_NAME" ) +MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) +MAINT_MASTER=( "master" "maint-0.4.1" "$GIT_PATH/$TOR_MASTER_NAME" ) RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) -RELEASE_034=( "release-0.3.4" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" ) RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) +RELEASE_041=( "release-0.4.1" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) # The master branch path has to be the main repository thus contains the # origin that will be used to fetch the updates. All the worktrees are created @@ -55,14 +55,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF -${MAINT_034[0]} ${MAINT_035[0]} ${MAINT_040[0]} +${MAINT_041[0]} ${MAINT_MASTER[0]} ${RELEASE_029[0]} -${RELEASE_034[0]} ${RELEASE_035[0]} ${RELEASE_040[0]} +${RELEASE_041[0]} EOF ########################## @@ -74,15 +74,15 @@ EOF WORKTREE=( RELEASE_029[@] - MAINT_034[@] - RELEASE_034[@] - MAINT_035[@] RELEASE_035[@] MAINT_040[@] RELEASE_040[@] + MAINT_041[@] + RELEASE_041[@] + MAINT_MASTER[@] ) COUNT=${#WORKTREE[@]} diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 5d1d58e4b..ec8511d27 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -37,15 +37,15 @@ TOR_WKT_NAME="tor-wkt" # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" ) -MAINT_034=( "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" ) MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) +MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) -RELEASE_034=( "release-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) +RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) # The master branch path has to be the main repository thus contains the # origin that will be used to fetch the updates. All the worktrees are created @@ -55,14 +55,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF ${MAINT_029[0]} -${MAINT_034[0]} ${MAINT_035[0]} ${MAINT_040[0]} +${MAINT_041[0]} ${MAINT_MASTER[0]} ${RELEASE_029[0]} -${RELEASE_034[0]} ${RELEASE_035[0]} ${RELEASE_040[0]} +${RELEASE_041[0]} EOF ########################## @@ -75,15 +75,15 @@ WORKTREE=( MAINT_029[@] RELEASE_029[@] - MAINT_034[@] - RELEASE_034[@] - MAINT_035[@] RELEASE_035[@] MAINT_040[@] RELEASE_040[@] + MAINT_041[@] + RELEASE_041[@] + MAINT_MASTER[@] ) COUNT=${#WORKTREE[@]} diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 0ce951d4b..9e1b39c10 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -5,7 +5,7 @@ UPSTREAM_BRANCH="upstream" git push $UPSTREAM_BRANCH \ master \ + {release,maint}-0.4.1 \ {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ - {release,maint}-0.3.4 \ {release,maint}-0.2.9

1 0

[tor/master] Merge branch 'tor-github/pr/1098'
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit ece5133e0dbc9049e09d7104cc5cf21630902fa7 Merge: e9f1e975d 0635170cf Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 11 13:19:43 2019 +0300 Merge branch 'tor-github/pr/1098' scripts/git/git-merge-forward.sh | 20 ++++++++++---------- scripts/git/git-pull-all.sh | 16 ++++++++-------- scripts/git/git-push-all.sh | 6 +++--- 3 files changed, 21 insertions(+), 21 deletions(-)

1 0

[tor/master] Add an environment variable to set GIT_PATH in git scripts
by asn＠torproject.org 11 Jun '19

11 Jun '19

commit 0635170cf14c3b622ee9fdf67ea81f4e564dd39d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 09:05:26 2019 -0400 Add an environment variable to set GIT_PATH in git scripts --- scripts/git/git-merge-forward.sh | 2 +- scripts/git/git-pull-all.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 98ad07c9c..15af6f3db 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -14,7 +14,7 @@ # ... which means that the tor worktrees are in /home/<user>/git/tor-wkt # Where are all those git repositories? -GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" +GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"} # The tor master git repository directory from which all the worktree have # been created. TOR_MASTER_NAME="tor" diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index ec8511d27..6fe7e5981 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -14,7 +14,7 @@ # ... which means that the tor worktrees are in /home/<user>/git/tor-wkt # Where are all those git repositories? -GIT_PATH="FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY" +GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"} # The tor master git repository directory from which all the worktree have # been created. TOR_MASTER_NAME="tor"

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 11 Jun '19

11 Jun '19

commit 80fa5e874f2ded424f73b0eb8024d00df2d21ea9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 11 10:20:32 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-ca.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tor-outreach2019-2020-ca.md b/tor-outreach2019-2020-ca.md index 3715997b5..d3db8f6cc 100644 --- a/tor-outreach2019-2020-ca.md +++ b/tor-outreach2019-2020-ca.md @@ -1,8 +1,8 @@ # Tor Outreach Material 2019-2020 -# 1. TOR FOR PRIVACY +# 1. TOR PER A LA PRIVADESA -### Privacy is a human right +### La privadesa és un dret humà Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web. @@ -16,9 +16,9 @@ She goes to a privacy training at a local hackerspace and learns about **Tor Bro --- -# 2.TOR FOR FEMINISTS +# 2. TOR PER AL FEMINISME -### The future is cyberfeminist +### El futur és ciberfeminista Fernanda runs a women's collective focused on reproductive rights in Brazil, where abortion is illegal.

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 11 Jun '19

11 Jun '19

commit bf1061cc1085295ea563151408f910aff1164d24 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 11 10:15:39 2019 +0000 Update translations for donatepages-messagespot --- locale/ca/LC_MESSAGES/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/ca/LC_MESSAGES/messages.po b/locale/ca/LC_MESSAGES/messages.po index 7aa50793c..72bc8891e 100644 --- a/locale/ca/LC_MESSAGES/messages.po +++ b/locale/ca/LC_MESSAGES/messages.po @@ -682,7 +682,7 @@ msgstr "" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:509 msgid "Strength in Numbers T-Shirt" -msgstr "" +msgstr "Samarreta «Força en nombres»" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:513 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:485 @@ -697,7 +697,7 @@ msgstr "" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:521 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:493 msgid "A required field is missing from the form." -msgstr "" +msgstr "Manca un camp necessari en el formulari." #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:523 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:495 @@ -724,7 +724,7 @@ msgstr "" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:542 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:514 msgid "This field is required" -msgstr "" +msgstr "El camp és necessari" #: tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:546 #: tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:518

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 11 Jun '19

11 Jun '19

commit a722eae14b9a87a8ef5f4c69b70a3ee7dd10378f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 11 09:50:40 2019 +0000 Update translations for tpo-web --- contents+ca.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 6eea88be7..12c114095 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -3,6 +3,7 @@ # Emma Peel, 2019 # Marc Ripoll <markripesp(a)gmail.com>, 2019 # erinm, 2019 +# jmontane, 2019 # msgid "" msgstr "" @@ -10,7 +11,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-06-05 12:03+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: jmontane, 2019\n" "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "Anonimat a la xarxa" #: https//www.torproject.org/ (content/contents+en.lrpage.section) msgid "home" -msgstr "" +msgstr "inici" #: https//www.torproject.org/ (content/contents+en.lrpage.body) msgid "###### ABOUT US ######" @@ -55,7 +56,7 @@ msgstr "Contacte" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.section) msgid "The Tor Project" -msgstr "" +msgstr "El projecte Tor" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body) @@ -115,7 +116,7 @@ msgstr "Suport" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Jobs" -msgstr "" +msgstr "Feina" #: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.body) msgid "Blog" @@ -929,7 +930,7 @@ msgstr "" #: templates/press.html:54 msgid "Coverage" -msgstr "" +msgstr "Cobertura" #: templates/press.html:61 msgid "Date" @@ -937,11 +938,11 @@ msgstr "Data" #: templates/press.html:62 msgid "Publication" -msgstr "" +msgstr "Publicació" #: templates/press.html:63 msgid "Topic" -msgstr "" +msgstr "Tema" #: templates/reports.html:2 msgid "Founding Documents" @@ -949,11 +950,11 @@ msgstr "" #: templates/reports.html:16 msgid "Reports" -msgstr "" +msgstr "Informes" #: templates/reports.html:22 msgid "Year" -msgstr "" +msgstr "Any" #: templates/reports.html:23 msgid "Type" @@ -981,11 +982,11 @@ msgstr "" #: templates/sponsors.html:5 msgid "Active Sponsors" -msgstr "" +msgstr "Patrocinadors actius" #: templates/sponsors.html:17 msgid "Past Sponsors" -msgstr "" +msgstr "Patrocinadors anteriors" #: templates/sponsors.html:35 msgid "" @@ -1023,8 +1024,8 @@ msgstr "" #: templates/macros/jobs.html:11 msgid "Read more." -msgstr "" +msgstr "Més informació." #: templates/macros/reports.html:5 templates/macros/reports.html:19 msgid "View PDF" -msgstr "" +msgstr "Mostra el PDF"

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 11 Jun '19

11 Jun '19

commit 14bbfb0f889216709b603d3d567126abf73ef5e5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 11 09:46:30 2019 +0000 Update translations for mat-gui_completed --- ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ca.po b/ca.po index 778774956..e643dae6c 100644 --- a/ca.po +++ b/ca.po @@ -8,11 +8,11 @@ # laia_, 2015-2016 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" -"Last-Translator: Josep Anton Rius <j.rius.cat(a)gmail.com>\n" +"PO-Revision-Date: 2019-06-11 09:44+0000\n" +"Last-Translator: jmontane\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Jun '19

11 Jun '19

commit 31cfd0aa2ee22fb8cea4796d505c53e6afd7b060 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 11 09:46:25 2019 +0000 Update translations for mat-gui --- ca.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ca.po b/ca.po index 778774956..e643dae6c 100644 --- a/ca.po +++ b/ca.po @@ -8,11 +8,11 @@ # laia_, 2015-2016 msgid "" msgstr "" -"Project-Id-Version: The Tor Project\n" +"Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-04-12 19:01+0000\n" -"Last-Translator: Josep Anton Rius <j.rius.cat(a)gmail.com>\n" +"PO-Revision-Date: 2019-06-11 09:44+0000\n" +"Last-Translator: jmontane\n" "Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0