tor-commits May 2019

tor-commits@lists.torproject.org

17 participants
2795 discussions

[tpo/staging] Merge branch 'master' into master
by emmapeel＠torproject.org 29 May '19

29 May '19

commit b7d1e5f56e83827b539cad1a3fe3584c745c4152 Merge: 59a96c3 a0931ab Author: Antonela <hola(a)antonela.me> Date: Fri Apr 26 10:07:31 2019 -0300 Merge branch 'master' into master content/about/people/boklm/contents.lr | 2 +- content/about/people/ewyatt/contents.lr | 2 +- content/about/people/sajolida/contents.lr | 2 +- content/menu/contents.lr | 16 ++++++++++++++++ templates/download-options.html | 1 - templates/download-tor.html | 21 +++++++++++++++++++-- 6 files changed, 38 insertions(+), 6 deletions(-)

1 0

[tpo/staging] Add donate block in /download
by emmapeel＠torproject.org 29 May '19

29 May '19

commit cf013b58b16d264afb7bc439d98dd5a8c2517ae7 Author: Antonela <hola(a)antonela.me> Date: Fri Apr 26 16:03:33 2019 -0300 Add donate block in /download --- templates/download.html | 11 +++++++---- templates/macros/downloads.html | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/download.html b/templates/download.html index 0e4befb..7408621 100644 --- a/templates/download.html +++ b/templates/download.html @@ -46,10 +46,13 @@ <div class="container justify-content-center mt-4"> <div class="row justify-content-center"> <i class="display-5 text-primary pr-3 fas fa-signature-png"></i><p class="text-primary text-tpo"> - <a class="mx-auto pl-2" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> - + <a class="mx-auto pl-2" href="{{ 'https://support.torproject.org/' + this.alt + '/tbb/how-to-verify-signature/' }}" target="_blank"><u>{{ _('Verify Tor Browser signature') }}</u></a></p> </div> </div> -<div class="container"> - <div class="row border-bottom border-light"><p></p></div> +<div class="container bg-primary mt-5"> + <div class="col-md-8 mx-auto text-center p-5"> + <h2 class="display-4 text-white">{{ _('Stand up for privacy and freedom online.') }}</h2> + <p class="text-white">{{ _('We’re a nonprofit organization and rely on supporters like you to help us keep Tor robust and secure for millions of people worldwide.') }}</p> + <a class="btn btn-lg btn-warning" href="https://donate.torproject.org">{{ _('Donate Now') }}</a> + </div> </div> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 71056cf..d743245 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -58,5 +58,5 @@ {% endmacro %} {% macro render_tor_browser_manual() %} -<a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>{{ _('tor browser manual') }}</u></a> +<a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>{{ _('Tor Browser manual') }}</u></a> {% endmacro %}

1 0

[tpo/staging] Merge remote-tracking branch 'anto/master'
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 1cb3fbbd846b571b8973e6ee8445cd2eef37c104 Merge: f8fa754 b7d1e5f Author: hiro <hiro(a)torproject.org> Date: Fri Apr 26 15:08:32 2019 +0200 Merge remote-tracking branch 'anto/master' templates/footer.html | 1 + templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

1 0

[tpo/staging] Add Download options
by emmapeel＠torproject.org 29 May '19

29 May '19

commit a0931ab88924292ce18b69d7e8ede685ef62a614 Author: hiro <hiro(a)torproject.org> Date: Fri Apr 26 14:48:15 2019 +0200 Add Download options --- templates/download-options.html | 1 - templates/download-tor.html | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/templates/download-options.html b/templates/download-options.html index 0bebe37..8698e73 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -33,7 +33,6 @@ </td> </tr> {% endfor %} - {% set t = bag('versions', 'torbrowser-stable') %} </tbody> </table> </div> diff --git a/templates/download-tor.html b/templates/download-tor.html index 607b22d..699ce0a 100644 --- a/templates/download-tor.html +++ b/templates/download-tor.html @@ -5,6 +5,7 @@ </div> <div class="container py-3"> <div class="row"> + <h2 class="text-primary">Tor Source</h2> <table class="table"> <thead> <tr> @@ -30,4 +31,20 @@ </tbody> </table> </div> + <div class="row"> + <h2 class="text-primary">Windows Expert Bundle</h2> + {% set t = bag('versions', 'torbrowser-stable') %} + <table class="table"> + <tbody> + <tr> + <td>Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</td> + <td>Contains just Tor and nothing else.</td> + <td class="text-right"> + {% from "macros/downloads.html" import render_windows_expert %} + {{ render_windows_expert(t.version, t.win32) }} + </td> + </tr> + </tbody> + </table> + </div> </div>

1 0

[tpo/staging] Add Donate button on high priority
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 351a218a7bab396aa936557513f2e60629342d05 Author: Antonela <hola(a)antonela.me> Date: Fri Apr 26 09:23:49 2019 -0300 Add Donate button on high priority --- templates/navbar.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/navbar.html b/templates/navbar.html index 7235a69..1f2d70d 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -9,6 +9,7 @@ <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > <span class="sr-only">Tor Logo</span> </a> + <a href="/donate" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h5></a> <label for="nav-toggle"> <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> {{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span>

1 0

[tpo/staging] Fix copy typos
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 9c648a8b06b2165ff52274527a4977dfe320f039 Author: Antonela <hola(a)antonela.me> Date: Fri Apr 26 16:07:59 2019 -0300 Fix copy typos --- templates/download-android.html | 2 +- templates/download.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index 8660c9a..420856c 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -33,6 +33,6 @@ </div> </div> <div class="row pb-5"> - <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a> + <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a> </div> </div> diff --git a/templates/download.html b/templates/download.html index 7408621..561d727 100644 --- a/templates/download.html +++ b/templates/download.html @@ -11,7 +11,7 @@ </div> <div class="row pl-3 pr-5 text-tpo"> <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won\'t connect is an incorrect system clock. Please make sure it\'s set correctly.') }}</p> - <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> + <a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQs at our Support Portal') }}</a> </div> </div> <div class="col-sm-6">

1 0

[tpo/staging] Add Footer link
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 59a96c3dfaaa68891aa4cf254907e8c804b27f04 Author: Antonela <hola(a)antonela.me> Date: Fri Apr 26 10:05:39 2019 -0300 Add Footer link --- templates/footer.html | 1 + templates/navbar.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/footer.html b/templates/footer.html index 17208ef..cbeb039 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -41,6 +41,7 @@ </li> {% endfor %} </ul> + <a href="https://donate.torproject.org" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2 mt-2">{{ _("Donate Now") }}</span></h5></a> </div> </div> <div class="col-12 d-flex justify-content-center border"> diff --git a/templates/navbar.html b/templates/navbar.html index 1f2d70d..71b4738 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -9,7 +9,7 @@ <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > <span class="sr-only">Tor Logo</span> </a> - <a href="/donate" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h5></a> + <a href="https://donate.torproject.org" title="{{ _("Donate") }}"><h5><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h5></a> <label for="nav-toggle"> <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> {{ _("Menu") }} <span class="navbar-toggler-icon ml-1"></span>

1 0

[tpo/staging] Add .png for fallback support
by emmapeel＠torproject.org 29 May '19

29 May '19

commit b06deec87fd2efc01b0e64fb3b1e4c12fa7ab080 Author: Antonela <hola(a)antonela.me> Date: Thu Apr 11 12:54:58 2019 -0300 Add .png for fallback support --- assets/static/images/home/png/block-trackers.png | Bin 0 -> 18192 bytes assets/static/images/home/png/block-trackers(a)2x.png | Bin 0 -> 42047 bytes assets/static/images/home/png/block-trackers(a)3x.png | Bin 0 -> 66496 bytes assets/static/images/home/png/browse-freely.png | Bin 0 -> 27282 bytes assets/static/images/home/png/browse-freely(a)2x.png | Bin 0 -> 62800 bytes assets/static/images/home/png/browse-freely(a)3x.png | Bin 0 -> 99137 bytes assets/static/images/home/png/encryption.png | Bin 0 -> 19727 bytes assets/static/images/home/png/encryption(a)2x.png | Bin 0 -> 44050 bytes assets/static/images/home/png/encryption(a)3x.png | Bin 0 -> 70895 bytes assets/static/images/home/png/fingerprinting.png | Bin 0 -> 28619 bytes assets/static/images/home/png/fingerprinting(a)2x.png | Bin 0 -> 64240 bytes assets/static/images/home/png/fingerprinting(a)3x.png | Bin 0 -> 100068 bytes assets/static/images/home/png/surveillance.png | Bin 0 -> 18021 bytes assets/static/images/home/png/surveillance(a)2x.png | Bin 0 -> 40297 bytes assets/static/images/home/png/surveillance(a)3x.png | Bin 0 -> 63810 bytes assets/static/images/home/{ => svg}/block-trackers.svg | 0 assets/static/images/home/{ => svg}/browse-freely.svg | 0 assets/static/images/home/{ => svg}/encryption.svg | 0 assets/static/images/home/{ => svg}/fingerprinting.svg | 0 assets/static/images/home/{ => svg}/surveillance.svg | 0 20 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/home/png/block-trackers.png b/assets/static/images/home/png/block-trackers.png new file mode 100644 index 0000000..47f01f0 Binary files /dev/null and b/assets/static/images/home/png/block-trackers.png differ diff --git a/assets/static/images/home/png/block-trackers(a)2x.png b/assets/static/images/home/png/block-trackers(a)2x.png new file mode 100644 index 0000000..e569748 Binary files /dev/null and b/assets/static/images/home/png/block-trackers(a)2x.png differ diff --git a/assets/static/images/home/png/block-trackers(a)3x.png b/assets/static/images/home/png/block-trackers(a)3x.png new file mode 100644 index 0000000..d57ab41 Binary files /dev/null and b/assets/static/images/home/png/block-trackers(a)3x.png differ diff --git a/assets/static/images/home/png/browse-freely.png b/assets/static/images/home/png/browse-freely.png new file mode 100644 index 0000000..1ffdc6d Binary files /dev/null and b/assets/static/images/home/png/browse-freely.png differ diff --git a/assets/static/images/home/png/browse-freely(a)2x.png b/assets/static/images/home/png/browse-freely(a)2x.png new file mode 100644 index 0000000..c71fed1 Binary files /dev/null and b/assets/static/images/home/png/browse-freely(a)2x.png differ diff --git a/assets/static/images/home/png/browse-freely(a)3x.png b/assets/static/images/home/png/browse-freely(a)3x.png new file mode 100644 index 0000000..981faa7 Binary files /dev/null and b/assets/static/images/home/png/browse-freely(a)3x.png differ diff --git a/assets/static/images/home/png/encryption.png b/assets/static/images/home/png/encryption.png new file mode 100644 index 0000000..36efb7c Binary files /dev/null and b/assets/static/images/home/png/encryption.png differ diff --git a/assets/static/images/home/png/encryption(a)2x.png b/assets/static/images/home/png/encryption(a)2x.png new file mode 100644 index 0000000..ed71a6d Binary files /dev/null and b/assets/static/images/home/png/encryption(a)2x.png differ diff --git a/assets/static/images/home/png/encryption(a)3x.png b/assets/static/images/home/png/encryption(a)3x.png new file mode 100644 index 0000000..abfaf1a Binary files /dev/null and b/assets/static/images/home/png/encryption(a)3x.png differ diff --git a/assets/static/images/home/png/fingerprinting.png b/assets/static/images/home/png/fingerprinting.png new file mode 100644 index 0000000..abe2743 Binary files /dev/null and b/assets/static/images/home/png/fingerprinting.png differ diff --git a/assets/static/images/home/png/fingerprinting(a)2x.png b/assets/static/images/home/png/fingerprinting(a)2x.png new file mode 100644 index 0000000..74cc958 Binary files /dev/null and b/assets/static/images/home/png/fingerprinting(a)2x.png differ diff --git a/assets/static/images/home/png/fingerprinting(a)3x.png b/assets/static/images/home/png/fingerprinting(a)3x.png new file mode 100644 index 0000000..1c4bb3b Binary files /dev/null and b/assets/static/images/home/png/fingerprinting(a)3x.png differ diff --git a/assets/static/images/home/png/surveillance.png b/assets/static/images/home/png/surveillance.png new file mode 100644 index 0000000..be1404e Binary files /dev/null and b/assets/static/images/home/png/surveillance.png differ diff --git a/assets/static/images/home/png/surveillance(a)2x.png b/assets/static/images/home/png/surveillance(a)2x.png new file mode 100644 index 0000000..ea9daa2 Binary files /dev/null and b/assets/static/images/home/png/surveillance(a)2x.png differ diff --git a/assets/static/images/home/png/surveillance(a)3x.png b/assets/static/images/home/png/surveillance(a)3x.png new file mode 100644 index 0000000..d529651 Binary files /dev/null and b/assets/static/images/home/png/surveillance(a)3x.png differ diff --git a/assets/static/images/home/block-trackers.svg b/assets/static/images/home/svg/block-trackers.svg similarity index 100% rename from assets/static/images/home/block-trackers.svg rename to assets/static/images/home/svg/block-trackers.svg diff --git a/assets/static/images/home/browse-freely.svg b/assets/static/images/home/svg/browse-freely.svg similarity index 100% rename from assets/static/images/home/browse-freely.svg rename to assets/static/images/home/svg/browse-freely.svg diff --git a/assets/static/images/home/encryption.svg b/assets/static/images/home/svg/encryption.svg similarity index 100% rename from assets/static/images/home/encryption.svg rename to assets/static/images/home/svg/encryption.svg diff --git a/assets/static/images/home/fingerprinting.svg b/assets/static/images/home/svg/fingerprinting.svg similarity index 100% rename from assets/static/images/home/fingerprinting.svg rename to assets/static/images/home/svg/fingerprinting.svg diff --git a/assets/static/images/home/surveillance.svg b/assets/static/images/home/svg/surveillance.svg similarity index 100% rename from assets/static/images/home/surveillance.svg rename to assets/static/images/home/svg/surveillance.svg

1 0

[tpo/staging] add Icelandic and Georgian language
by emmapeel＠torproject.org 29 May '19

29 May '19

commit 9cf90b3c2aa26df2d11efb6abc86041b28c73a13 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Apr 11 13:01:42 2019 +0200 add Icelandic and Georgian language --- configs/i18n.ini | 2 +- databags/about+is.ini | 1 + databags/about+ka.ini | 1 + databags/alternatives.ini | 12 ++++++++++++ databags/menu+is.ini | 19 +++++++++++++++++++ databags/menu+ka.ini | 19 +++++++++++++++++++ databags/menu_footer+is.ini | 1 + databags/menu_footer+ka.ini | 1 + tpo.lektorproject | 10 ++++++++++ 9 files changed, 65 insertions(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 482b129..81d4abd 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = de,es,fr,it,pt-BR,ru,tr +translations = de,es,fr,is,it,ka,pt-BR,ru,tr i18npath = i18n translate_paragraphwise = False url_prefix = https://www.torproject.org/ diff --git a/databags/about+is.ini b/databags/about+is.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+is.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+ka.ini b/databags/about+ka.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+ka.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 33cf83c..7603b21 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -22,12 +22,24 @@ order = order-last url = /fr/ language = Français (fr) +[is] +direction = text-left +order = order-last +url = /is/ +language = Íslenska (is) + [it] direction = text-left order = order-last url = /it/ language = Italiano (it) +[ka] +direction = text-left +order = order-last +language = Georgian (ka) +url = /ka/ + [pt-BR] direction = text-left order = order-last diff --git a/databags/menu+is.ini b/databags/menu+is.ini new file mode 100644 index 0000000..d77e346 --- /dev/null +++ b/databags/menu+is.ini @@ -0,0 +1,19 @@ +[about] +path = /about/history +label = About + +[documentation] +path = https://2019.www.torproject.org/docs/documentation.html.en +label = Documentation + +[support] +path = https://support.torproject.org/ +label = Support + +[blog] +path = https://blog.torproject.org +label = Blog + +[donate] +path = https://donate.torproject.org +label = Donate diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini new file mode 100644 index 0000000..e3357ba --- /dev/null +++ b/databags/menu+ka.ini @@ -0,0 +1,19 @@ +[about] +path = /about/history +label = About + +[documentation] +path = https://2019.www.torproject.org/docs/documentation.html.en +label = Documentation + +[support] +path = https://support.torproject.org/ +label = Support + +[blog] +path = https://blog.torproject.org +label = Blog + +[donate] +path = https://donate.torproject.org/ka +label = Donate diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+is.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+ka.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/tpo.lektorproject b/tpo.lektorproject index e266309..8523e44 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -25,11 +25,21 @@ name = Français (fr) url_prefix = /fr/ locale = fr +[alternatives.is] +name = Íslenska (is) +url_prefix = /is/ +locale = is + [alternatives.it] name = Italiano (it) url_prefix = /it/ locale = it +[alternatives.ka] +name = Georgian (ka) +url_prefix = /ka/ +locale = ka + [alternatives.pt-BR] name = Português Brasil (pt-BR) url_prefix = /pt-BR/

1 0

[tpo/staging] Fix layout
by emmapeel＠torproject.org 29 May '19

29 May '19

commit e6be1a886416d8c806b69358049aa00aeed49d40 Author: hiro <hiro(a)torproject.org> Date: Thu Apr 11 00:20:12 2019 +0200 Fix layout --- content/contact/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/contact/contents.lr b/content/contact/contents.lr index 8e6f7b9..633b38e 100644 --- a/content/contact/contents.lr +++ b/content/contact/contents.lr @@ -12,6 +12,6 @@ title: Contact --- body: -<h4 class="text-primary">Get Support <span class="oi oi-arrow-right p-1" title="icon arrow-right" aria-hidden="true"></span></h4> +### Get Support Need help? Visit our [Support Portal](https://support.torproject.org) for answers to frequently asked questions about connecting to Tor, circumventing censorship, using onion services, and more.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2019