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

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 10 Dec '19

10 Dec '19

commit 2ee875397c6ab75cfd518d72197c65b3af25d8a3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 10 15:20:20 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+it.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+it.po b/contents+it.po index 9b58fed2a0..0cc52bb4c6 100644 --- a/contents+it.po +++ b/contents+it.po @@ -1184,11 +1184,11 @@ msgid "" "[FAQ](https://www.torproject.org/docs/faq#EntryGuards) and [Support " "Portal](https://support.torproject.org/tbb/tbb-2/)." msgstr "" -"Nel circuito, il Guard o nodo di entrata è il primo nodo e in modo " -"automatico casuale scelto da Tor. Esso è differente dagli altri nodi nel " -"circuito. Per evitare attacchi il nodo Guard cambia dopo 2-3 mesi, non come " -"gli altri nodi, che cambiano per ogni nuovo dominio. Per maggiori " -"informazioni riguardanti Guards, consulta le pagine " +"Nel circuito, il Guard o nodo di entrata è il primo nodo scelto da Tor in " +"modo automatico e casuale. Esso è differente dagli altri nodi nel circuito. " +"Per evitare attacchi, il nodo Guard cambia dopo 2-3 mesi, non come gli altri" +" nodi, che cambiano per ogni nuovo dominio. Per maggiori informazioni " +"riguardanti Guards, consulta le pagine " "[FAQ](https://www.torproject.org/docs/faq#EntryGuards) e [Supporto al " "Portale](https://support.torproject.org/tbb/tbb-2/). "

1 0

[tor/master] Merge branch 'tor-github/pr/1583'
by dgoulet＠torproject.org 10 Dec '19

10 Dec '19

commit 71767b06ae4905aa73992b19bc49f1654efe7a4e Merge: 944bdde50 c959ea755 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Dec 10 09:42:09 2019 -0500 Merge branch 'tor-github/pr/1583' src/test/test_hs_control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] hs-v3: Fix memory leak in test_hs_control_store_permanent_creds()
by dgoulet＠torproject.org 10 Dec '19

10 Dec '19

commit c959ea7558d059ebcf167d573b7a4327834982c7 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Dec 4 13:40:03 2019 +0200 hs-v3: Fix memory leak in test_hs_control_store_permanent_creds() --- src/test/test_hs_control.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs_control.c b/src/test/test_hs_control.c index d064f203a..33ea9ada7 100644 --- a/src/test/test_hs_control.c +++ b/src/test/test_hs_control.c @@ -525,6 +525,7 @@ test_hs_control_store_permanent_creds(void *arg) { /* Setup ClientOnionAuthDir */ int ret; char *perm_creds_dir = tor_strdup(get_fname("permanent_credentials")); + get_options_mutable()->ClientOnionAuthDir = perm_creds_dir; #ifdef _WIN32 ret = mkdir(perm_creds_dir); @@ -532,8 +533,6 @@ test_hs_control_store_permanent_creds(void *arg) ret = mkdir(perm_creds_dir, 0700); #endif tt_int_op(ret, OP_EQ, 0); - - get_options_mutable()->ClientOnionAuthDir = perm_creds_dir; } tor_free(args); @@ -622,6 +621,7 @@ test_hs_control_store_permanent_creds(void *arg) tt_uint_op(digest256map_size(client_auths), OP_EQ, 0); done: + tor_free(get_options_mutable()->ClientOnionAuthDir); tor_free(args); tor_free(cp1); buf_free(TO_CONN(&conn)->outbuf);

1 0

[tpo/develop] Change databag and download template
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit c54e83b4962ee23a1b6c8985ef365d63261d0b48 Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 13:14:22 2019 +0100 Change databag and download template --- databags/platforms.ini | 4 ++-- templates/hero-download.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/databags/platforms.ini b/databags/platforms.ini index 43306c2..7d0efbe 100644 --- a/databags/platforms.ini +++ b/databags/platforms.ini @@ -1,10 +1,10 @@ [windows] path = windows -label = Microsoft Windows +label = Windows [apple] path = osx -label = Apple OS X +label = OS X [linux] path = linux diff --git a/templates/hero-download.html b/templates/hero-download.html index e142ecb..8628627 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -29,7 +29,7 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ id }}</a> + <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ item.label }}</a> <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{ _('Signature') }}</span></a> </div> </div>

1 0

[tpo/develop] Use navbar-min in Download section
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit ca16fbc3cf4ddf882e04373e6d8ae194b7b23b13 Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 13:03:47 2019 +0100 Use navbar-min in Download section --- templates/meta.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 478f22d..5a899f2 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -20,5 +20,9 @@ <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> <body class="no-gutters"> <header> - {% include 'navbar.html' %} + {% if this.section == "Download" %} + {% include 'navbar-min.html' %} + {% else %} + {% include 'navbar.html' %} + {% endif %} </header>

1 0

[tpo/develop] Merge changes to download templates
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit 4d7382386babfc099873355bb9ea8d5d8e777c22 Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 12:58:46 2019 +0100 Merge changes to download templates --- lego | 2 +- templates/download-android.html | 10 +++++++--- templates/download.html | 2 +- templates/hero-download.html | 22 +++++++++++++--------- templates/navbar-min.html | 19 +++++++++++++++++++ 5 files changed, 41 insertions(+), 14 deletions(-) diff --git a/lego b/lego index f0ea955..e058aee 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 +Subproject commit e058aee7e40a97434ddbffbb1d5ffe18a610076b diff --git a/templates/download-android.html b/templates/download-android.html index bcb8fcc..968a579 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -14,6 +14,13 @@ <div class="row"> <h3 class="mx-auto text-center text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> + </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> {% set t = bag('versions', 'torbrowser-stable') %} @@ -36,9 +43,6 @@ </div> </div> </div> - <div class="d-none d-lg-block col-lg-5 col-md-6"> - <img class="img-fluid p-5 m-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> - </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 an iOS user? We encourage you to try Onion Browser.') }} </a> diff --git a/templates/download.html b/templates/download.html index b5ef03d..27f7192 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> - <a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQs at our Support Portal') }}</a> + <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> </div> </div> <div class="col-sm-6"> diff --git a/templates/hero-download.html b/templates/hero-download.html index a13fb08..e142ecb 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -7,7 +7,7 @@ <div class="row p-5 mx-auto"> {% for id, item in bag('platforms').items() %} <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> + <div class="oval-2 bg-darker"> {% set alt_l = alt %} {% set t = bag('versions', 'torbrowser-stable') %} {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %} @@ -29,23 +29,27 @@ <a class="downloadLink" href="{{ download_link }}"> <i class="text-light fab fa-{{ id }}-png"></i> </a> - <p><small class="float-left"><a class="btn btn-primary btn-sm nick mx-5 my-4" href="{{ sig_link }}">sig</a></small></p> + <a class="btn btn-primary mt-4" href="{{ download_link }}">{{ _('Download for') }} {{ id }}</a> + <a class="link" href="{{ sig_link }}"><span class="nick text-white">{{ _('Signature') }}</span></a> </div> </div> - {% endfor %} - <div class="col-sm-6 col-md-3 py-3"> - <div class="oval-2 bg-darker mx-auto"> - <a href="#android"> - <i class="text-light fab fa-android-png"></i> - </a> + {% endfor %} + <div class="col-sm-6 col-md-3 py-3"> + <div class="oval-2 bg-darker mx-auto"> + <a href="#android"> + <i class="text-light fab fa-android-png"></i> + </a> + <a class="btn btn-primary mt-4" href="#android">{{ _('Download for Android') }}</a> + </div> </div> - </div> </div> + <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </div> + <div class="hidden-sm row p-md-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> </div> diff --git a/templates/navbar-min.html b/templates/navbar-min.html new file mode 100644 index 0000000..f9d2bc7 --- /dev/null +++ b/templates/navbar-min.html @@ -0,0 +1,19 @@ +{% if not this.color %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% elif this.color == 'primary' %} +<div class="container-fluid bg-primary"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> +{% else %} +<div class="container-fluid bg-dark"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> +{% endif %} + + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + </div> + </nav> +</div>

1 0

[tpo/develop] 0.4.2.5 is released.
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit b0c4ad0fdf4fa08665a9de0149d75613a439af69 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 13:27:02 2019 -0500 0.4.2.5 is released. --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index 0186dc1..446c05e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,8 +6,8 @@ win32 = 0.4.1.6 version = 9.5a3 [tor-stable] -version = 0.4.1.6 +version = 0.4.2.5 [tor-alpha] -version = 0.4.2.4-rc +version = 0.4.2.5

1 0

[tpo/develop] Bug 32675: Add lt, ms, th locales to the alpha download page
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit cab9f95c5ec7434c967e2ccf5f98e7bbe5aed352 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Dec 5 12:21:33 2019 +0100 Bug 32675: Add lt, ms, th locales to the alpha download page --- databags/download-alternatives-alpha.ini | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/databags/download-alternatives-alpha.ini b/databags/download-alternatives-alpha.ini index 1badac9..ae9a793 100644 --- a/databags/download-alternatives-alpha.ini +++ b/databags/download-alternatives-alpha.ini @@ -74,10 +74,18 @@ language = ქართული ენა (ka) url = /ko/ language = 한국어 (ko) +[lt] +url = /lt/ +language = Lietuvių (lt) + [mk] url = /mk/ language = македонски (mk) +[ms] +url = /ms/ +language = Melayu (ms) + [nb-NO] url = /nb-NO/ language = Norsk Bokmål (nb-NO) @@ -106,6 +114,10 @@ url = /ru/ url = /sv-SE/ language = Svenska (sv-SE) +[th] +url = /th/ +language = ภาษาไทย (th) + [tr] url = /tr/ language = Türkçe (tr)

1 0

[tpo/develop] Update lego
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit 7c2839d2c8bd959f9619878631d1d9ebe7b522ef Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:04:23 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index f9f1591..7c0e9ee 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f9f1591892c374ae037f442dad78e366abed4364 +Subproject commit 7c0e9ee42a4cdef87ebb8eefa7dde2df89403c94

1 0

[tpo/develop] Modify homepage to account for ltr locales
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit 5510c38e3ae8ed5843e1134921dd031877e09de0 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 13:57:05 2019 +0100 Modify homepage to account for ltr locales --- lego | 2 +- templates/homepage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lego b/lego index 3409e3e..f9f1591 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc +Subproject commit f9f1591892c374ae037f442dad78e366abed4364 diff --git a/templates/homepage.html b/templates/homepage.html index 52e41a2..4eb22be 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -11,7 +11,7 @@ <main role="main" class="mx-auto col-12 {{ locale.order }} {{ locale.direction }}"> {% include this.html %} {% if this.parent.path != "/download" %} - <div class="container pt-5 hero"> + <div class="container pt-5 hero {{ locale.order }} {{ locale.direction }}"> {% block body %}{% endblock %} </div> {% endif %}

1 0