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

[tor/release-0.4.5] Merge branch 'tor-gitlab/mr/144' into maint-0.4.5
by dgoulet＠torproject.org 18 Nov '20

18 Nov '20

commit fcf5bbb59fe12304dd60da248fafc5d892629d1b Merge: 16351d655d 16412c698c Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 18 11:29:02 2020 -0500 Merge branch 'tor-gitlab/mr/144' into maint-0.4.5 configure.ac | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[tpo/master] Add new Tor Browser version (10.5a4)
by gk＠torproject.org 18 Nov '20

18 Nov '20

commit 11e1106bef4dc81b8ef6319f191973bdee932046 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 18 14:18:04 2020 +0000 Add new Tor Browser version (10.5a4) --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 110473bd..9d636e5a 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -24,5 +24,9 @@ body: "10.5a3", "10.5a3-MacOS", "10.5a3-Linux", -"10.5a3-Windows" +"10.5a3-Windows", +"10.5a4", +"10.5a4-MacOS", +"10.5a4-Linux", +"10.5a4-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index df96933f..9b6d5b1b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,10 +6,10 @@ win32 = 0.4.4.6 version = 10.0.4 [torbrowser-alpha] -version = 10.5a3 +version = 10.5a4 [torbrowser-android-alpha] -version = 10.5a3 +version = 10.5a4 [tor-stable] version = 0.4.4.6

1 0

[tpo/master] Deprecate old Tor Browser versions
by gk＠torproject.org 18 Nov '20

18 Nov '20

commit 6bbc4796d94e8718c00e23f86708abb8c03f0173 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 18 14:20:15 2020 +0000 Deprecate old Tor Browser versions --- .../projects/torbrowser/RecommendedTBBVersions/contents.lr | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 9d636e5a..d734866d 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,22 +5,10 @@ _template: empty.html body: [ -"10.0.2", -"10.0.2-MacOS", -"10.0.2-Linux", -"10.0.2-Windows", -"10.0.4", -"10.0.4-MacOS", -"10.0.4-Linux", -"10.0.4-Windows", "10.0.5", "10.0.5-MacOS", "10.0.5-Linux", "10.0.5-Windows", -"10.5a2", -"10.5a2-MacOS", -"10.5a2-Linux", -"10.5a2-Windows" "10.5a3", "10.5a3-MacOS", "10.5a3-Linux",

1 0

[tor-browser-build/master] Fix 10.5a4 Changelog
by gk＠torproject.org 18 Nov '20

18 Nov '20

commit bdac5396c0ca011149ba7cb3e00f5b6fbc567731 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 18 13:54:10 2020 +0000 Fix 10.5a4 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5ba0abd..569e744 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -11,7 +11,7 @@ Tor Browser 10.5a4 -- November 17 2020 * Bug 40152: Top Crash: android.database.sqlite.SQLiteConstraintException [tor-browser-build] * Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware [tor-browser] * Bug 40205: Replace occurrence of EmptyCString with 0-length _ns literal [tor-browser] - * Bug 40206: Disable the /etc/hosts parser + * Bug 40206: Disable the /etc/hosts parser [tor-browser] * Translations update * Build System * OS X

1 0

[tor-browser-build/master] Fold in 10.0.5 Changelog
by gk＠torproject.org 18 Nov '20

18 Nov '20

commit 17a67a81adc440703c28e0e443e037db584bfc6d Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 18 13:54:57 2020 +0000 Fold in 10.0.5 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 569e744..95d4819 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,12 @@ Tor Browser 10.5a4 -- November 17 2020 * Bug 40126: Bump Node to 10.22.1 for mozilla83 [tor-browser-build] * Bug 40127: Update components for switch to mozilla83-based Fenix [tor-browser-build] +Tor Browser 10.0.5 -- November 17 2020 + * Windows + OS X + Linux + * Update Firefox to 78.5.0esr + * Update Tor to 0.4.4.6 + * Bug 40212: Add new default obfs4 bridge [tor-browser] + Tor Browser 10.5a3 -- November 10 2020 * All Platforms * Update NoScript to 11.1.5

1 0

[lego/master] Add pipe url in header tag link
by hiro＠torproject.org 18 Nov '20

18 Nov '20

commit c3a9b12ac74beb177adb53d4ab7ed283e540632a Author: hiro <hiro(a)torproject.org> Date: Wed Nov 18 14:50:14 2020 +0100 Add pipe url in header tag link --- templates/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/header.html b/templates/header.html index 0f2bc89..4980bfe 100644 --- a/templates/header.html +++ b/templates/header.html @@ -19,7 +19,7 @@ <img src="{{ header_mobile | asseturl }}" class="donate-header-image-mobile img-fluid" /> {% if this.header_tag_line %} <div class="text-center py-3"> - <a href="{{ this.header_tag_link }}" title="Friends of Tor" class="match">{{ _( this.header_tag_line ) }}</a> + <a href="{{ this.header_tag_link | url }}" title="Friends of Tor" class="match">{{ _( this.header_tag_line ) }}</a> </div> {% endif %} </div>

1 0

[lego/master] Fix typo
by hiro＠torproject.org 18 Nov '20

18 Nov '20

commit 9c2cffefd6417b428102d12e71b4d70995e9cb6f Author: hiro <hiro(a)torproject.org> Date: Wed Nov 18 14:40:21 2020 +0100 Fix typo --- templates/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/header.html b/templates/header.html index d1895ad..0f2bc89 100644 --- a/templates/header.html +++ b/templates/header.html @@ -19,7 +19,7 @@ <img src="{{ header_mobile | asseturl }}" class="donate-header-image-mobile img-fluid" /> {% if this.header_tag_line %} <div class="text-center py-3"> - <a href="{{ this.header_tag_link }}" title="Friends of Tor" class="match">{{ _({{ this.header_tag_line }}) }}</a> + <a href="{{ this.header_tag_link }}" title="Friends of Tor" class="match">{{ _( this.header_tag_line ) }}</a> </div> {% endif %} </div>

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 18 Nov '20

18 Nov '20

commit 0e233052b716acff488cb94eba3b186e512c2980 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 18 13:21:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+hu.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index b14668787e..9f1d7bd178 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -2,9 +2,9 @@ # Translators: # István Dávid <istvandavid(a)icloud.com>, 2019 # Tamas Pajor <tpajor17(a)icloud.com>, 2019 -# vargaviktor <viktor.varga(a)gmail.com>, 2020 # erinm, 2020 # Gus, 2020 +# vargaviktor <viktor.varga(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -12,7 +12,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-04-15 19:40+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Gus, 2020\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2020\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -219,7 +219,7 @@ msgstr "" #: https//support.torproject.org/glossary/atlas/ #: (content/glossary/atlas/contents+en.lrword.term) msgid "Atlas" -msgstr "" +msgstr "Atlas" #: https//support.torproject.org/glossary/atlas/ #: (content/glossary/atlas/contents+en.lrword.definition)

1 0

[lego/master] Use tag line and link in header template
by hiro＠torproject.org 18 Nov '20

18 Nov '20

commit 35d2ae7fd87a38cf72aff40c0f06877d6b48a448 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 18 14:05:29 2020 +0100 Use tag line and link in header template --- templates/header.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/header.html b/templates/header.html index 15da4bf..d1895ad 100644 --- a/templates/header.html +++ b/templates/header.html @@ -17,11 +17,11 @@ {% set idx = this.header_image.index(".png") %} {% set header_mobile = this.header_image[:idx] + "-mobile" + this.header_image[idx:] %} <img src="{{ header_mobile | asseturl }}" class="donate-header-image-mobile img-fluid" /> - - <div class="text-center py-3"> - <a href="https://blog.torproject.org/friends-of-tor-match-2020" target="_blank" title="Friends of Tor" class="match">{{ _('Your donation will be matched by Friends of Tor, up to $100,000.') }}</a> - </div> - + {% if this.header_tag_line %} + <div class="text-center py-3"> + <a href="{{ this.header_tag_link }}" title="Friends of Tor" class="match">{{ _({{ this.header_tag_line }}) }}</a> + </div> + {% endif %} </div> {% else %} <div class="col-12 content-center pt-5">

1 0

[donate-static/master] Allow add tag line and link in header in donate-form
by hiro＠torproject.org 18 Nov '20

18 Nov '20

commit dac952e9e0b8f11db36d200736259fccdd0b16b3 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 18 14:05:04 2020 +0100 Allow add tag line and link in header in donate-form --- content/contents.lr | 4 ++++ models/donate-form.ini | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/content/contents.lr b/content/contents.lr index 43098407..46259ab7 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -88,6 +88,10 @@ tshirt_perk_monthly_label: T-Shirt --- tshirt_perk_monthly_image: /static/images/donate/t-shirt-use-tor.png --- +header_tag_line: Your donation will be matched by Friends of Tor, up to $100,000. +--- +header_tag_link:https://blog.torproject.org/friends-of-tor-match-2020 +--- header_image: /static/css/images/donate-banner.png --- header_color: black diff --git a/models/donate-form.ini b/models/donate-form.ini index 8455ebb6..6666207c 100644 --- a/models/donate-form.ini +++ b/models/donate-form.ini @@ -44,6 +44,14 @@ type = string label = Header Color type = string +[fields.header_tag_line] +label = Header Tag Line +type = string + +[fields.header_tag_link] +label = Header Tag Link +type = url + [fields.success_redirect_url] label = URL to redirect to after donation completed successfully type = url

1 0