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

[tpo/master] Update trademark FAQ link in footer
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 6368b1b91f9cf373048c9f13d1af091c5389f72d Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sun Sep 8 07:37:56 2019 +0530 Update trademark FAQ link in footer will-fix https://dip.torproject.org/web/tpo/issues/39 partly --- templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/footer.html b/templates/macros/footer.html index 90b9dfd..e3c90c8 100644 --- a/templates/macros/footer.html +++ b/templates/macros/footer.html @@ -1,3 +1,3 @@ {% macro render_faq() %} - <a href="https://www.torproject.org/docs/trademark-faq" target="_blank" class="text-primary text-light"><u>FAQ</u></a> + <a href="https://www.torproject.org/about/trademark/" target="_blank" class="text-primary text-light"><u>FAQ</u></a> {% endmacro %}

1 0

[tpo/master] replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 003b8280668fdc791a07dcb3dc56d291977345eb Merge: 4f51cb4 6368b1b Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:51:31 2019 +0200 replace link to "How to report bugs or feedback" templates/macros/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Find and replace all links to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit cce3a1c4e978c767ed1d5ce90876a89815beb758 Author: sabita <35147757+sabitarao(a)users.noreply.github.com> Date: Sat Sep 7 12:50:18 2019 +0530 Find and replace all links to "How to report bugs or feedback" Fixes part of https://dip.torproject.org/web/support/issues/39 --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index bd87b90..7860217 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -60,7 +60,7 @@ <div class="oval-3 mt-3 p-2"><i class="text-primary fas fa-spider-png"></i></div> </div> <div class="row mt-3 mr-5"> - <a class="h4 text-primary" href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugF…" target="_blank">{{ _('Report a bug or give feedback.') }}</a> + <a class="h4 text-primary" href="https://support.torproject.org/misc/bug-or-feedback/" target="_blank">{{ _('Report a bug or give feedback.') }}</a> <p class="text-tpo">{{ _('Tor relies on the support of users and volunteers around the world to help us improve our software and resources, so your feedback is extremely valuable to us (and to all Tor users).') }}</p> </div> <div class="row">

1 0

[tpo/master] replace link to "How to report bugs or feedback"
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 4f51cb429be74696ddfa54aba40e53cac1f672e7 Merge: 4bdc8bb cce3a1c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:50:09 2019 +0200 replace link to "How to report bugs or feedback" close https://github.com/torproject/tpo/pull/57 templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/master] Replace databag with macro
by hiro＠torproject.org 11 Sep '19

11 Sep '19

commit 7d805317583586b4c2006c8972c4c235a1caebe5 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Sat Sep 7 08:15:45 2019 -0400 Replace databag with macro Generate Android links with a macro instead of hard-coding in a databag. --- databags/download-tb-for-android-alpha.ini | 14 -------------- templates/download-options.html | 28 +++++++++++++++++++++------- templates/macros/downloads.html | 7 +++++++ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/databags/download-tb-for-android-alpha.ini b/databags/download-tb-for-android-alpha.ini deleted file mode 100644 index 5006897..0000000 --- a/databags/download-tb-for-android-alpha.ini +++ /dev/null @@ -1,14 +0,0 @@ -[Google Play] -url = https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp… - -[arch64] -url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… -sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… - -[arm] -url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… -sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… - -[x86] -url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… -sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… diff --git a/templates/download-options.html b/templates/download-options.html index c515669..e0edd8e 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -44,13 +44,27 @@ </tr> </thead> <tbody> - {% for id, item in bag('download-tb-for-android-alpha').items() %} - <tr> - <td> - <a href="{{ item.url }}">{{ id }}</a>{% if item.sig %} (<a href="{{ item.sig }}">sig</a>){% endif %} - </td> - </tr> - {% endfor %} + <tr> + <td> + <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">Google Play</a> + </td> + </tr> + {% from "macros/downloads.html" import render_android %} + <tr> + <td> + {{ render_android(t.version, "aarch64") }} + </td> + </tr> + <tr> + <td> + {{ render_android(t.version, "armv7") }} + </td> + </tr> + <tr> + <td> + {{ render_android(t.version, "x86") }} + </td> + </tr> </tbody> </table> </div> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index d743245..7581aca 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -49,6 +49,13 @@ <a class="downloadLink" href="{{ download_link_32 }}">32-bit</a> (<a href="{{ sig_link_32 }}">sig</a>) / <a href="{{ download_link_64 }}">64-bit</a> (<a href="{{ sig_link_64 }}">sig<a/>) {% endmacro %} +{% macro render_android(version, arch) %} + {% set download_link = 'https://dist.torproject.org/torbrowser/' + version + '/' + 'tor-browser-' + version + '-android-' + arch + '-multi.apk' %} + {% set sig_link = download_link + '.asc' %} + + <a href="{{ download_link }}">{{ arch }}</a> (<a href="{{ sig_link }}">sig</a>) +{% endmacro %} + {% macro render_fdroid() %} <small class="badge-pill badge-dark mx-1 nick">S00N</small> {% endmacro %}

1 0

[tpo/master] Add links to download Tor Browser for Android
by hiro＠torproject.org 11 Sep '19

11 Sep '19

commit 2da1ff9871a74767905b60eb411112ba5b069d53 Author: RotationMatrix <52428419+RotationMatrix(a)users.noreply.github.com> Date: Fri Sep 6 11:42:19 2019 -0400 Add links to download Tor Browser for Android --- databags/download-tb-for-android-alpha.ini | 14 ++++++++++++++ templates/download-options.html | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/databags/download-tb-for-android-alpha.ini b/databags/download-tb-for-android-alpha.ini new file mode 100644 index 0000000..5006897 --- /dev/null +++ b/databags/download-tb-for-android-alpha.ini @@ -0,0 +1,14 @@ +[Google Play] +url = https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp… + +[arch64] +url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… +sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-aarch64… + +[arm] +url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… +sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-armv7-m… + +[x86] +url = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… +sig = https://dip.torproject.org/web/tpo/master/tor-browser-9.0a6-android-x86-mul… diff --git a/templates/download-options.html b/templates/download-options.html index 8698e73..c515669 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -36,4 +36,22 @@ </tbody> </table> </div> + <div class="row"> + <table class="table"> + <thead> + <tr> + <th>Tor Browser for Android Alpha</th> + </tr> + </thead> + <tbody> + {% for id, item in bag('download-tb-for-android-alpha').items() %} + <tr> + <td> + <a href="{{ item.url }}">{{ id }}</a>{% if item.sig %} (<a href="{{ item.sig }}">sig</a>){% endif %} + </td> + </tr> + {% endfor %} + </tbody> + </table> + </div> </div>

1 0

[tpo/master] Merge remote-tracking branch 'rotmatrix/fix-34-android-alpha-downloads'
by hiro＠torproject.org 11 Sep '19

11 Sep '19

commit 4bdc8bbc052a2d5e8ab89e9fcc800048122004ef Merge: b23afc4 7d80531 Author: hiro <hiro(a)torproject.org> Date: Wed Sep 11 12:38:28 2019 +0200 Merge remote-tracking branch 'rotmatrix/fix-34-android-alpha-downloads' Add links to download Tor Browser for Android Alpha templates/download-options.html | 32 ++++++++++++++++++++++++++++++++ templates/macros/downloads.html | 7 +++++++ 2 files changed, 39 insertions(+)

1 0

[community/master] Ops! Small typo
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit 4bffa9619e6e50badc26e9659c59b00649ef724d Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Thu Sep 5 17:30:39 2019 -0400 Ops! Small typo --- .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr index 86c1638..241a967 100644 --- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr +++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr @@ -1,6 +1,6 @@ _model: page --- -title: BSD* +title: *BSD --- color: primary ---

1 0

[community/master] typo.
by emmapeel＠torproject.org 11 Sep '19

11 Sep '19

commit bcc60b133cc2b06259261e061eb1b116a00463b6 Merge: ee0a98f 4bffa96 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Sep 11 12:32:06 2019 +0200 typo. closes https://github.com/torproject/community/pull/10 .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gk/bug_31621'
by boklm＠torproject.org 11 Sep '19

11 Sep '19

commit f08dbd57ed76faa08007608130da50c4f80a9d64 Merge: 873865a 5648e14 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Sep 11 12:26:32 2019 +0200 Merge remote-tracking branch 'gk/bug_31621' projects/firefox/build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)

1 0