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

[tpo/staging] update to last master
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit a7a18c6f5b225c3ae828f844e76850d448fcb363 Merge: 01bc40f 753988d Author: emma peel <emma.peel(a)riseup.net> Date: Tue Oct 15 10:36:41 2019 +0200 update to last master .github/FUNDING.yml | 3 + .htaccess | 7 +- README.md | 63 ++++++++++++++++ assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes assets/static/images/favicon/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon/favicon.png | Bin 0 -> 1184 bytes assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes assets/static/js | 2 +- assets/static/keys/sstevenson.txt | 79 +++++++++++++++++++++ content/about/cy-pres/contents.lr | 4 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/anarcat/contents.lr | 17 +++++ content/about/people/arma/contents.lr | 4 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/igt0/contents.lr | 17 ----- content/about/people/juga/contents.lr | 2 +- content/about/people/meejah/contents.lr | 2 + content/about/people/sajolida/contents.lr | 2 +- content/about/people/schneier-core/contents.lr | 15 ++++ content/about/people/schneier/contents.lr | 13 ++++ content/about/people/sstevenson/contents.lr | 4 ++ content/about/people/wshackleton/contents.lr | 20 ++++++ .../about/reports/2009-data-collection/contents.lr | 2 +- .../about/reports/2010-irs-form-990/contents.lr | 4 +- content/about/reports/2011-form-pc/contents.lr | 2 +- .../reports/2012-financial-statements/contents.lr | 2 +- content/about/reports/2012-form-pc/contents.lr | 2 +- content/about/reports/2013-form-pc/contents.lr | 2 +- .../2016-12-05-tor-project-bylaws/contents.lr | 6 +- .../about/sponsors/DARPA-georgetown/contents.lr | 17 +++++ content/about/sponsors/nsf-georgetown/contents.lr | 7 +- content/about/sponsors/nsf-minnesota/contents.lr | 2 +- content/about/trademark/contents.lr | 21 ++++++ content/about/trademark/trademark-faq/contents.lr | 15 ++++ .../trademark-faq/trademark-faq-1/contents.lr | 13 ++++ .../trademark-faq/trademark-faq-2/contents.lr | 12 ++++ .../trademark-faq/trademark-faq-3/contents.lr | 13 ++++ .../trademark-faq/trademark-faq-4/contents.lr | 16 +++++ .../trademark-faq/trademark-faq-5/contents.lr | 21 ++++++ .../trademark-faq/trademark-faq-6/contents.lr | 10 +++ .../trademark-faq/trademark-faq-7/contents.lr | 13 ++++ content/download/alpha/contents.lr | 2 +- content/download/languages/contents.lr | 2 +- .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ content/press/in-defense-of-anonymity/contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../mozilla-offers-research-grant/contents.lr | 19 +++++ content/press/new-release-tor-browser/contents.lr | 2 +- .../contents.lr | 19 +++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 20 +++--- databags/about+en.ini | 4 ++ databags/menu+bn-BD.ini | 20 +----- databags/menu+de.ini | 20 +----- databags/menu+en.ini | 20 +----- databags/menu+es.ini | 20 +----- databags/menu+fr.ini | 20 +----- databags/menu+id.ini | 20 +----- databags/menu+is.ini | 20 +----- databags/menu+it.ini | 20 +----- databags/menu+ka.ini | 20 +----- databags/menu+ko.ini | 20 +----- databags/menu+pt-BR.ini | 20 +----- databags/menu+ru.ini | 20 +----- databags/menu+tr.ini | 20 +----- databags/menu_footer+ar.ini | 2 +- databags/menu_footer+de.ini | 2 +- databags/menu_footer+en.ini | 16 +---- databags/menu_footer+es.ini | 2 +- databags/menu_footer+fr.ini | 2 +- databags/menu_footer+id.ini | 2 +- databags/menu_footer+is.ini | 2 +- databags/menu_footer+it.ini | 2 +- databags/menu_footer+ka.ini | 2 +- databags/menu_footer+ko.ini | 2 +- databags/menu_footer+pt-BR.ini | 2 +- databags/menu_footer+ru.ini | 2 +- databags/menu_footer+tr.ini | 2 +- databags/menu_footer+zh-CN.ini | 2 +- databags/versions.ini | 16 +++-- lego | 2 +- models/person.ini | 5 ++ models/question.ini | 20 ++++++ models/topic.ini | 23 ++++++ models/trademark.ini | 34 +++++++++ templates/about.html | 9 ++- templates/bottom_banner.html | 1 + templates/contact.html | 13 ++-- templates/download-android.html | 31 ++++---- templates/download-options.html | 37 ++++++++++ templates/hero-download.html | 18 +++-- templates/macros/contact.html | 2 +- templates/macros/downloads.html | 15 ++-- templates/macros/footer.html | 2 +- templates/macros/people.html | 5 +- templates/macros/question.html | 22 ++++++ templates/macros/topic.html | 18 +++++ templates/meta.html | 7 +- templates/question.html | 6 ++ templates/topic.html | 6 ++ templates/trademark.html | 6 ++ 110 files changed, 886 insertions(+), 382 deletions(-) diff --cc templates/download-android.html index c299b45,1f8fa2d..5223003 --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -14,36 -14,25 +14,29 @@@ <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-md-6 col-sm-4 text-center p1"> - <div class="row"> - {% set t = bag('versions', 'torbrowser-alpha') %} - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> - <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>{{ _('sig') }}</small></a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> - <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('sig') }}</small></a> - </div> - </div> - <div class="col-md-3 col-sm-4 text-center p1"> - <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> - </div> + <div class="col-xl-6 mx-auto text-center"> + {% set t = bag('versions', 'torbrowser-stable-android') %} + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>sig</small></a> + <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser">{{ _('Go to Google Play') }}</a> {% from "macros/downloads.html" import render_fdroid %} - <div class="col-md-3 col-sm-4 text-center p1"> - <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> -  - </div> - </div> - <div class="row"> - <a class="text-light mx-auto 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="btn btn-block btn-lg btn-light text-primary my-2" href="https://support.torproject.org/tormobile/tormobile-7/">{{ _('Go to F-Droid') }}</a> +  + </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>

1 0

[tpo/staging] Move Rose Foundation to Past Sponsors
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 9603484f50aa673fe1a4d76b07914d3826642db8 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Aug 2 16:28:04 2019 +0100 Move Rose Foundation to Past Sponsors --- content/about/sponsors/rose/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/sponsors/rose/contents.lr b/content/about/sponsors/rose/contents.lr index 486e285..90e76f7 100644 --- a/content/about/sponsors/rose/contents.lr +++ b/content/about/sponsors/rose/contents.lr @@ -1,6 +1,6 @@ _model: sponsor --- -active: True +active: False --- time: 2018 ---

1 0

[tpo/staging] Update CNP logo
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit b699aa40c687d22be35eb65e50f9454d8bf1a153 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Aug 2 14:28:58 2019 +0100 Update CNP logo --- .../sponsors/craig-newmark-philanthropies.png | Bin 29629 -> 28397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/sponsors/craig-newmark-philanthropies.png b/assets/static/images/sponsors/craig-newmark-philanthropies.png index 76145b3..f6ece06 100644 Binary files a/assets/static/images/sponsors/craig-newmark-philanthropies.png and b/assets/static/images/sponsors/craig-newmark-philanthropies.png differ

1 0

[tpo/staging] fixes #31325 - Update Sponsors page with "Digital Impact Alliance" entry
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 70a6c8df35b7997cf5314fb477864a2451e00b8b Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Aug 8 14:22:27 2019 +0100 fixes #31325 - Update Sponsors page with "Digital Impact Alliance" entry --- assets/static/images/sponsors/dial.png | Bin 0 -> 26001 bytes content/about/sponsors/dial/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/dial.png b/assets/static/images/sponsors/dial.png new file mode 100644 index 0000000..bd3566f Binary files /dev/null and b/assets/static/images/sponsors/dial.png differ diff --git a/content/about/sponsors/dial/contents.lr b/content/about/sponsors/dial/contents.lr new file mode 100644 index 0000000..c161189 --- /dev/null +++ b/content/about/sponsors/dial/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: True +--- +time: 2019 +--- +name: Digital Impact Alliance +--- +key: 17 +--- +logo: /static/images/sponsors/dial.png +--- +_hidden: yes +--- +link: https://digitalimpactalliance.org/ +--- +description: + +The Digital Impact Alliance (DIAL) advances digital inclusion to achieve the Sustainable Development Goals (SDGs), so that all women, men and children can benefit from life-enhancing, mobile-based digital services. DIAL is supporting a project to complete a successful ESR transition for Tor Browser to we ensure stability, security, and usability of this core privacy technology on both desktop and mobile.

1 0

[tpo/staging] add press content
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 8b6151b59ffea74074df723d54969ceaef9ddbe3 Author: Antonela <hola(a)antonela.me> Date: Thu Aug 1 11:46:42 2019 -0300 add press content close https://dip.torproject.org/web/tpo/issues/3 --- .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ content/press/in-defense-of-anonymity/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ .../press/mozilla-offers-research-grant/contents.lr | 19 +++++++++++++++++++ .../contents.lr | 19 +++++++++++++++++++ 10 files changed, 190 insertions(+) diff --git a/content/press/china-blocks-access-to-all-language-editions-of-wikipedia-2/contents.lr b/content/press/china-blocks-access-to-all-language-editions-of-wikipedia-2/contents.lr new file mode 100644 index 0000000..6e0abf1 --- /dev/null +++ b/content/press/china-blocks-access-to-all-language-editions-of-wikipedia-2/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: NYPost +--- +title: China Blocks Access to All Language Editions of Wikipedia +--- +link: https://nypost.com/2019/05/13/china-blocks-access-to-all-language-editions-… +--- +pub_date: 2019-05-13 +--- +summary: +--- +body: diff --git a/content/press/china-blocks-access-to-all-language-editions-of-wikipedia/contents.lr b/content/press/china-blocks-access-to-all-language-editions-of-wikipedia/contents.lr new file mode 100644 index 0000000..0d79184 --- /dev/null +++ b/content/press/china-blocks-access-to-all-language-editions-of-wikipedia/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: PCMag +--- +title: China Blocks Access to All Language Editions of Wikipedia +--- +link: https://www.pcmag.com/news/368329/china-blocks-access-to-all-language-editi… +--- +pub_date: 2019-05-13 +--- +summary: +--- +body: diff --git a/content/press/cyber-security-101-protect-your-privacy-from-hackers/contents.lr b/content/press/cyber-security-101-protect-your-privacy-from-hackers/contents.lr new file mode 100644 index 0000000..0f292fd --- /dev/null +++ b/content/press/cyber-security-101-protect-your-privacy-from-hackers/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: ZDNet +--- +title: Cyber security 101: Protect your privacy from hackers, spies, and the government +--- +link: https://www.zdnet.com/article/online-security-101-how-to-protect-your-priva… +--- +pub_date: 2019-05-24 +--- +summary: +--- +body: diff --git a/content/press/first-official-version-of-tor-browser-for-android-released/contents.lr b/content/press/first-official-version-of-tor-browser-for-android-released/contents.lr new file mode 100644 index 0000000..eba152c --- /dev/null +++ b/content/press/first-official-version-of-tor-browser-for-android-released/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: ZDNet +--- +title: First official version of Tor Browser for Android released on the Play Store +--- +link: https://www.zdnet.com/article/first-official-version-of-tor-browser-for-and… +--- +pub_date: 2019-05-29 +--- +summary: +--- +body: diff --git a/content/press/how-to-use-the-Tor-browser-on-an-android-device/contents.lr b/content/press/how-to-use-the-Tor-browser-on-an-android-device/contents.lr new file mode 100644 index 0000000..42b3499 --- /dev/null +++ b/content/press/how-to-use-the-Tor-browser-on-an-android-device/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Tech Republic +--- +title: How to use the Tor browser on an Android device +--- +link: https://www.techrepublic.com/article/how-to-use-the-tor-browser-on-an-andro… +--- +pub_date: 2019-05-09 +--- +summary: +--- +body: diff --git a/content/press/in-defense-of-anonymity/contents.lr b/content/press/in-defense-of-anonymity/contents.lr new file mode 100644 index 0000000..d2d7931 --- /dev/null +++ b/content/press/in-defense-of-anonymity/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Mozilla +--- +title: In Defense of Anonymity +--- +link: https://internethealthreport.org/2019/in-defense-of-anonymity/ +--- +pub_date: 2019-04-24 +--- +summary: +--- +body: diff --git a/content/press/incognito-mode-wont-keep-your-browsing-private/contents.lr b/content/press/incognito-mode-wont-keep-your-browsing-private/contents.lr new file mode 100644 index 0000000..7367af9 --- /dev/null +++ b/content/press/incognito-mode-wont-keep-your-browsing-private/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Fast Company +--- +title: Incognito mode won't keep your browsing private. Do this instead. +--- +link: https://www.fastcompany.com/90311396/incognito-mode-wont-keep-you-private-t… +--- +pub_date: 2019-04-19 +--- +summary: +--- +body: diff --git a/content/press/it-s-time-to-switch-to-a-privacy-browser/contents.lr b/content/press/it-s-time-to-switch-to-a-privacy-browser/contents.lr new file mode 100644 index 0000000..af4394a --- /dev/null +++ b/content/press/it-s-time-to-switch-to-a-privacy-browser/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: Wired +--- +title: It's Time to Switch to a Privacy Browser +--- +link: https://www.wired.com/story/privacy-browsers-duckduckgo-ghostery-brave/ +--- +pub_date: 2019-06-16 +--- +summary: +--- +body: diff --git a/content/press/mozilla-offers-research-grant/contents.lr b/content/press/mozilla-offers-research-grant/contents.lr new file mode 100644 index 0000000..4092ed0 --- /dev/null +++ b/content/press/mozilla-offers-research-grant/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: ZDNet +--- +title: Mozilla offers research grant for a way to embed Tor inside Firefox +--- +link: https://www.zdnet.com/article/mozilla-offers-research-grant-for-a-way-to-em… +--- +pub_date: 2019-05-09 +--- +summary: +--- +body: diff --git a/content/press/tech-giants-say-uk-spy-agency-s-encryption-proposal-is-threat-to-security-and-human-rights/contents.lr b/content/press/tech-giants-say-uk-spy-agency-s-encryption-proposal-is-threat-to-security-and-human-rights/contents.lr new file mode 100644 index 0000000..e3c80af --- /dev/null +++ b/content/press/tech-giants-say-uk-spy-agency-s-encryption-proposal-is-threat-to-security-and-human-rights/contents.lr @@ -0,0 +1,19 @@ +_model: post +--- +_hidden: yes +--- +active: True +--- +type: snippet +--- +publisher: CyberScoop +--- +title: Tech giants say UK spy agency's encryption proposal is threat to security and human rights +--- +link: https://www.cyberscoop.com/gchq-encryption-letter-going-dark/ +--- +pub_date: 2019-05-30 +--- +summary: +--- +body:

1 0

[tpo/staging] Add Craig Newmark Philanthropies to Sponsors
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 262035aebca84588bb6e1b62f826bdb5ef0170d4 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Aug 2 14:28:58 2019 +0100 Add Craig Newmark Philanthropies to Sponsors --- .../images/sponsors/craig-newmark-philanthropies.png | Bin 0 -> 29629 bytes .../craig-newmark-philanthropies/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/craig-newmark-philanthropies.png b/assets/static/images/sponsors/craig-newmark-philanthropies.png new file mode 100644 index 0000000..76145b3 Binary files /dev/null and b/assets/static/images/sponsors/craig-newmark-philanthropies.png differ diff --git a/content/about/sponsors/craig-newmark-philanthropies/contents.lr b/content/about/sponsors/craig-newmark-philanthropies/contents.lr new file mode 100644 index 0000000..87b3312 --- /dev/null +++ b/content/about/sponsors/craig-newmark-philanthropies/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: True +--- +time: 2019 +--- +name: Craig Newmark Philanthropies +--- +key: 16 +--- +logo: /static/images/sponsors/craig-newmark-philanthropies.png +--- +_hidden: yes +--- +link: https://craignewmarkphilanthropies.org/ +--- +description: + +Craig Newmark Philanthropies was created by craigslist founder Craig Newmark to support and connect people and drive broad civic engagement. The organization works to advance people and grassroots organizations that are getting stuff done in areas that include trustworthy journalism, voter protection, gender diversity in technology, and veterans and military families. The organization has provided Tor Project with an unrestricted gift.

1 0

[tpo/staging] typo. thanks kayazeren!
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit c2814b5566e47702c28c7d1ef1e4093196b1f383 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Aug 14 08:25:44 2019 +0200 typo. thanks kayazeren! --- content/about/cy-pres/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/cy-pres/contents.lr b/content/about/cy-pres/contents.lr index 6bc656f..7a7bb69 100644 --- a/content/about/cy-pres/contents.lr +++ b/content/about/cy-pres/contents.lr @@ -18,7 +18,7 @@ _Cy pres_ awards are funds distributed as a part of class action lawsuit settlem #### About the Tor Project -The Tor Project is a U.S.-based 501(3) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: +The Tor Project is a U.S.-based 501(c)3 nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: - Creating and deploying free and open anonymity and privacy technologies, - Supporting their unrestricted availability and use, and @@ -40,4 +40,4 @@ If you would like to speak to somebody at the Tor Project about whether or not t - [The Tor Project in the Media](https://www.torproject.org/press/) - [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) -- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file +- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/)

1 0

[tpo/staging] Use menu databags from lego
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 6aada1d3f880d60e019a038727fd15636758bfad Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:21:52 2019 +0200 Use menu databags from lego --- databags/menu+bn-BD.ini | 2 +- databags/menu+de.ini | 2 +- databags/menu+es.ini | 2 +- databags/menu+fr.ini | 2 +- databags/menu+id.ini | 2 +- databags/menu+is.ini | 2 +- databags/menu+it.ini | 2 +- databags/menu+ka.ini | 2 +- databags/menu+ko.ini | 2 +- databags/menu+pt-BR.ini | 2 +- databags/menu+ru.ini | 2 +- databags/menu+tr.ini | 2 +- databags/menu+zh-CN.ini | 2 +- databags/menu_footer+bn-BD.ini | 2 +- databags/menu_footer+de.ini | 2 +- databags/menu_footer+es.ini | 2 +- databags/menu_footer+fr.ini | 2 +- databags/menu_footer+id.ini | 2 +- databags/menu_footer+is.ini | 2 +- databags/menu_footer+it.ini | 2 +- databags/menu_footer+ka.ini | 2 +- databags/menu_footer+ko.ini | 2 +- databags/menu_footer+pt-BR.ini | 2 +- databags/menu_footer+ru.ini | 2 +- databags/menu_footer+tr.ini | 2 +- databags/menu_footer+zh-CN.ini | 2 +- lego | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini index 23a525b..c9b2dc8 120000 --- a/databags/menu+bn-BD.ini +++ b/databags/menu+bn-BD.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini index 23a525b..6bb02de 120000 --- a/databags/menu+de.ini +++ b/databags/menu+de.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 23a525b..fd8def3 120000 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 23a525b..5366289 120000 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini index 23a525b..7c2858b 120000 --- a/databags/menu+id.ini +++ b/databags/menu+id.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini index 23a525b..b02aed7 120000 --- a/databags/menu+is.ini +++ b/databags/menu+is.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini index 23a525b..fcdde73 120000 --- a/databags/menu+it.ini +++ b/databags/menu+it.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini index 23a525b..336d4ad 120000 --- a/databags/menu+ka.ini +++ b/databags/menu+ka.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini index 23a525b..31e262b 120000 --- a/databags/menu+ko.ini +++ b/databags/menu+ko.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini index 23a525b..fd27afb 120000 --- a/databags/menu+pt-BR.ini +++ b/databags/menu+pt-BR.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini index 23a525b..6f30a3e 120000 --- a/databags/menu+ru.ini +++ b/databags/menu+ru.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini index 23a525b..8a01592 120000 --- a/databags/menu+tr.ini +++ b/databags/menu+tr.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini index 23a525b..425a6f8 120000 --- a/databags/menu+zh-CN.ini +++ b/databags/menu+zh-CN.ini @@ -1 +1 @@ -menu+en.ini \ No newline at end of file +../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini index a3178a1..5dd8aed 120000 --- a/databags/menu_footer+bn-BD.ini +++ b/databags/menu_footer+bn-BD.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini index a3178a1..851da53 120000 --- a/databags/menu_footer+de.ini +++ b/databags/menu_footer+de.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini index a3178a1..c52cdcb 120000 --- a/databags/menu_footer+es.ini +++ b/databags/menu_footer+es.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini index a3178a1..7ce02c3 120000 --- a/databags/menu_footer+fr.ini +++ b/databags/menu_footer+fr.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini index a3178a1..056defd 120000 --- a/databags/menu_footer+id.ini +++ b/databags/menu_footer+id.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini index a3178a1..2474621 120000 --- a/databags/menu_footer+is.ini +++ b/databags/menu_footer+is.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini index a3178a1..8225a53 120000 --- a/databags/menu_footer+it.ini +++ b/databags/menu_footer+it.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini index a3178a1..fd41467 120000 --- a/databags/menu_footer+ka.ini +++ b/databags/menu_footer+ka.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini index a3178a1..6ff3bf2 120000 --- a/databags/menu_footer+ko.ini +++ b/databags/menu_footer+ko.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini index a3178a1..5198e0f 120000 --- a/databags/menu_footer+pt-BR.ini +++ b/databags/menu_footer+pt-BR.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini index a3178a1..ad782bc 120000 --- a/databags/menu_footer+ru.ini +++ b/databags/menu_footer+ru.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini index a3178a1..2c88858 120000 --- a/databags/menu_footer+tr.ini +++ b/databags/menu_footer+tr.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini index a3178a1..0fd8366 120000 --- a/databags/menu_footer+zh-CN.ini +++ b/databags/menu_footer+zh-CN.ini @@ -1 +1 @@ -menu_footer+en.ini \ No newline at end of file +../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/lego b/lego index b33b51f..aa31aec 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit b33b51fe9d1dd0f8d0de66e520e687415989e0cf +Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17

1 0

[tpo/staging] Use menu databags from lego
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 344972ac1fa5434ce4b34586aef3d13bdd76e3a1 Author: hiro <hiro(a)torproject.org> Date: Fri Aug 23 14:02:08 2019 +0200 Use menu databags from lego --- databags/menu+bn-BD.ini | 20 +------------------- databags/menu+de.ini | 20 +------------------- databags/menu+en.ini | 20 +------------------- databags/menu+es.ini | 20 +------------------- databags/menu+fr.ini | 20 +------------------- databags/menu+id.ini | 20 +------------------- databags/menu+is.ini | 20 +------------------- databags/menu+it.ini | 20 +------------------- databags/menu+ka.ini | 20 +------------------- databags/menu+ko.ini | 20 +------------------- databags/menu+pt-BR.ini | 20 +------------------- databags/menu+ru.ini | 20 +------------------- databags/menu+tr.ini | 20 +------------------- databags/menu+zh-CN.ini | 20 +------------------- databags/menu_footer+en.ini | 16 +--------------- lego | 2 +- 16 files changed, 16 insertions(+), 282 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini deleted file mode 100644 index 9f5fff0..0000000 --- a/databags/menu+bn-BD.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = /about/history -label = ইতিহাস - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = ডকুমেন্টেশন - -[support] -path = https://support.torproject.org/bn-BD/ -label = সমর্থন - -[blog] -path = https://blog.torproject.org -label = ব্লগ - -[donate] -path = https://donate.torproject.org -label = ডনেট করুন diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+bn-BD.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 100644 index 463b5b2..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/de/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/de/ -label = Donate diff --git a/databags/menu+de.ini b/databags/menu+de.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+de.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 100644 index d77e346..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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+en.ini b/databags/menu+en.ini new file mode 120000 index 0000000..1fa7edf --- /dev/null +++ b/databags/menu+en.ini @@ -0,0 +1 @@ +../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 100644 index 57b0146..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/es/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/es -label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+es.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 100644 index d078638..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/fr/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/fr/ -label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+fr.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini deleted file mode 100644 index 5c7d032..0000000 --- a/databags/menu+id.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = /about/history -label = Tentang - -[documentation] -path = https://2019.www.torproject.org/docs/documentation.html.en -label = Dokumentasi - -[support] -path = https://support.torproject.org/id/ -label = Dukungan - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org -label = Donasi diff --git a/databags/menu+id.ini b/databags/menu+id.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+id.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini deleted file mode 100644 index d77e346..0000000 --- a/databags/menu+is.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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+is.ini b/databags/menu+is.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+is.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini deleted file mode 100644 index 9dcc41b..0000000 --- a/databags/menu+it.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/it/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/it/ -label = Donate diff --git a/databags/menu+it.ini b/databags/menu+it.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+it.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini deleted file mode 100644 index e3357ba..0000000 --- a/databags/menu+ka.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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+ka.ini b/databags/menu+ka.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+ka.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini deleted file mode 100644 index d77e346..0000000 --- a/databags/menu+ko.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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+ko.ini b/databags/menu+ko.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+ko.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini deleted file mode 100644 index 89cf72f..0000000 --- a/databags/menu+pt-BR.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/pt-BR/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/pt_BR/ -label = Donate diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+pt-BR.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini deleted file mode 100644 index d77e346..0000000 --- a/databags/menu+ru.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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+ru.ini b/databags/menu+ru.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+ru.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini deleted file mode 100644 index 1b78e8d..0000000 --- a/databags/menu+tr.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/tr/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/tr/ -label = Donate diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+tr.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini deleted file mode 100644 index 773af15..0000000 --- a/databags/menu+zh-CN.ini +++ /dev/null @@ -1,19 +0,0 @@ -[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/zh-CN/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org/zh_CN -label = Donate diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+zh-CN.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini new file mode 120000 index 0000000..d14a20f --- /dev/null +++ b/databags/menu_footer+en.ini @@ -0,0 +1 @@ +../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/lego b/lego index 55784cf..b33b51f 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 55784cf553a4dbac0ef1bb49e33be6d0b23c91f1 +Subproject commit b33b51fe9d1dd0f8d0de66e520e687415989e0cf

1 0

[tpo/staging] Fix some redirects
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 296a6dab34a2035228a5b4104e23a04ac7d28acb Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 18:05:05 2019 +0200 Fix some redirects --- .htaccess | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.htaccess b/.htaccess index 3d43392..c476b56 100644 --- a/.htaccess +++ b/.htaccess @@ -11,6 +11,12 @@ RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] RewriteRule ^about(.*).html.en$ /about$1 [R=302,L] RewriteRule ^images/how_tor_works_thumb.png$ https://2019.www.torproject.org/images/how_tor_works_thumb.png [R=302,L] +# links from wikipedia + +RewriteRule ^about/findoc(.*) /static/findoc$1 [R=302,L] +RewriteRule ^about/corepeople$ /about/people/ [R=302,L] + + # moved to /docs/ RewriteRule ^docs/(.*) https://2019.www.torproject.org/docs/$1 [R=302,L] RewriteRule ^documentation.html$ https://2019.www.torproject.org/docs/documentation.html [R=302,L]

1 0