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

[community/staging] better links
by emmapeel＠torproject.org 27 May '19

27 May '19

commit f4228b5433aba1b3a3d5267c40bb68edc1477788 Author: emma peel <emma.peel(a)riseup.net> Date: Sun Mar 17 21:04:23 2019 +0100 better links --- databags/menu+ar.ini | 2 +- databags/menu+bn-BD.ini | 4 ++-- databags/menu+de.ini | 6 +++--- databags/menu+en.ini | 2 +- databags/menu+es.ini | 6 +++--- databags/menu+fr.ini | 6 +++--- databags/menu+pt-BR.ini | 14 +++++++------- databags/menu+tr.ini | 6 +++--- databags/menu+zh-CN.ini | 12 ++++++------ databags/menu_footer+ar.ini | 6 +++--- databags/menu_footer+bn-BD.ini | 6 +++--- databags/menu_footer+de.ini | 12 ++++++------ databags/menu_footer+en.ini | 6 +++--- databags/menu_footer+es.ini | 6 +++--- databags/menu_footer+fr.ini | 12 ++++++------ databags/menu_footer+pt-BR.ini | 10 +++++----- databags/menu_footer+tr.ini | 12 ++++++------ databags/menu_footer+zh-CN.ini | 12 ++++++------ databags/pagenav+fr.ini | 8 ++++---- 19 files changed, 74 insertions(+), 74 deletions(-) diff --git a/databags/menu+ar.ini b/databags/menu+ar.ini index 21246e1..a2e7848 100644 --- a/databags/menu+ar.ini +++ b/databags/menu+ar.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/about/history label = About [documentation] diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini index 21246e1..4eef942 100644 --- a/databags/menu+bn-BD.ini +++ b/databags/menu+bn-BD.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/bn-BD/about/history label = About [documentation] @@ -7,7 +7,7 @@ path = https://www.torproject.org/docs/documentation.html.en label = Documentation [support] -path = https://support.torproject.org/ +path = https://support.torproject.org/bn-BD/ label = Support [blog] diff --git a/databags/menu+de.ini b/databags/menu+de.ini index 21246e1..6aae1f0 100644 --- a/databags/menu+de.ini +++ b/databags/menu+de.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/de/about/history label = About [documentation] @@ -7,7 +7,7 @@ path = https://www.torproject.org/docs/documentation.html.en label = Documentation [support] -path = https://support.torproject.org/ +path = https://support.torproject.org/de label = Support [blog] @@ -15,5 +15,5 @@ path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org +path = https://donate.torproject.org/de label = Donate diff --git a/databags/menu+en.ini b/databags/menu+en.ini index 21246e1..a2e7848 100644 --- a/databags/menu+en.ini +++ b/databags/menu+en.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/about/history label = About [documentation] diff --git a/databags/menu+es.ini b/databags/menu+es.ini index 21246e1..0daf87f 100644 --- a/databags/menu+es.ini +++ b/databags/menu+es.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/es/about/history label = About [documentation] @@ -7,7 +7,7 @@ path = https://www.torproject.org/docs/documentation.html.en label = Documentation [support] -path = https://support.torproject.org/ +path = https://support.torproject.org/es/ label = Support [blog] @@ -15,5 +15,5 @@ path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org +path = https://donate.torproject.org/es label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini index 21246e1..c42b133 100644 --- a/databags/menu+fr.ini +++ b/databags/menu+fr.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/fr/about/history label = About [documentation] @@ -7,7 +7,7 @@ path = https://www.torproject.org/docs/documentation.html.en label = Documentation [support] -path = https://support.torproject.org/ +path = https://support.torproject.org/fr/ label = Support [blog] @@ -15,5 +15,5 @@ path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org +path = https://donate.torproject.org/fr label = Donate diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini index 21246e1..3f0144a 100644 --- a/databags/menu+pt-BR.ini +++ b/databags/menu+pt-BR.ini @@ -1,19 +1,19 @@ [about] -path = ttps://www.torproject.org/about/history -label = About +path = https://www.torproject.org/pt-BR/about/history +label = Sobre [documentation] path = https://www.torproject.org/docs/documentation.html.en -label = Documentation +label = Documentação [support] -path = https://support.torproject.org/ -label = Support +path = https://support.torproject.org/pt-BR/ +label = Assistência [blog] path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org -label = Donate +path = https://donate.torproject.org/pt_BR +label = Doe diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini index 21246e1..2597961 100644 --- a/databags/menu+tr.ini +++ b/databags/menu+tr.ini @@ -1,5 +1,5 @@ [about] -path = ttps://www.torproject.org/about/history +path = https://www.torproject.org/tr/about/history label = About [documentation] @@ -7,7 +7,7 @@ path = https://www.torproject.org/docs/documentation.html.en label = Documentation [support] -path = https://support.torproject.org/ +path = https://support.torproject.org/tr label = Support [blog] @@ -15,5 +15,5 @@ path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org +path = https://donate.torproject.org/tr label = Donate diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini index 21246e1..ee6edb8 100644 --- a/databags/menu+zh-CN.ini +++ b/databags/menu+zh-CN.ini @@ -1,14 +1,14 @@ [about] -path = ttps://www.torproject.org/about/history -label = About +path = https://www.torproject.org/zh-CN/about/history +label = 关于 [documentation] path = https://www.torproject.org/docs/documentation.html.en -label = Documentation +label = 文档 [support] -path = https://support.torproject.org/ -label = Support +path = https://support.torproject.org/zh-CN/ +label = 支持 [blog] path = https://blog.torproject.org @@ -16,4 +16,4 @@ label = Blog [donate] path = https://donate.torproject.org -label = Donate +label = 捐款 diff --git a/databags/menu_footer+ar.ini b/databags/menu_footer+ar.ini index e66659d..b97b531 100644 --- a/databags/menu_footer+ar.ini +++ b/databags/menu_footer+ar.ini @@ -1,5 +1,5 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/about/jobs label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact +path = https://www.torproject.org/contact label = Contact [press] -path = ttps://www.torproject.org/press +path = https://www.torproject.org/press label = Press diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini index e66659d..b97b531 100644 --- a/databags/menu_footer+bn-BD.ini +++ b/databags/menu_footer+bn-BD.ini @@ -1,5 +1,5 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/about/jobs label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact +path = https://www.torproject.org/contact label = Contact [press] -path = ttps://www.torproject.org/press +path = https://www.torproject.org/press label = Press diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini index e66659d..474a6de 100644 --- a/databags/menu_footer+de.ini +++ b/databags/menu_footer+de.ini @@ -1,15 +1,15 @@ [jobs] -path = ttps://www.torproject.org/about/jobs -label = Jobs +path = https://www.torproject.org/de/about/jobs +label = Arbeiten [blog] path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact -label = Contact +path = https://www.torproject.org/de/contact +label = Kontakt [press] -path = ttps://www.torproject.org/press -label = Press +path = https://www.torproject.org/de/press +label = Presse diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini index e66659d..b97b531 100644 --- a/databags/menu_footer+en.ini +++ b/databags/menu_footer+en.ini @@ -1,5 +1,5 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/about/jobs label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact +path = https://www.torproject.org/contact label = Contact [press] -path = ttps://www.torproject.org/press +path = https://www.torproject.org/press label = Press diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini index e66659d..553ed4a 100644 --- a/databags/menu_footer+es.ini +++ b/databags/menu_footer+es.ini @@ -1,5 +1,5 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/about/jobs label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact +path = https://www.torproject.org/es/contact label = Contact [press] -path = ttps://www.torproject.org/press +path = https://www.torproject.org/es/press label = Press diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini index e66659d..0457e30 100644 --- a/databags/menu_footer+fr.ini +++ b/databags/menu_footer+fr.ini @@ -1,15 +1,15 @@ [jobs] -path = ttps://www.torproject.org/about/jobs -label = Jobs +path = https://www.torproject.org/fr/about/jobs +label = Travaux [blog] path = https://blog.torproject.org -label = Blog +label = Blogue [contact] -path = ttps://www.torproject.org/contact +path = https://www.torproject.org/fr/contact label = Contact [press] -path = ttps://www.torproject.org/press -label = Press +path = https://www.torproject.org/fr/press +label = Presse diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini index e66659d..042e8a0 100644 --- a/databags/menu_footer+pt-BR.ini +++ b/databags/menu_footer+pt-BR.ini @@ -1,5 +1,5 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/pt-BR/about/jobs label = Jobs [blog] @@ -7,9 +7,9 @@ path = https://blog.torproject.org label = Blog [contact] -path = ttps://www.torproject.org/contact -label = Contact +path = https://www.torproject.org/pt-BR/contact +label = Contato [press] -path = ttps://www.torproject.org/press -label = Press +path = https://www.torproject.org/pt-BR/press +label = Impremsa diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini index e66659d..068ee6e 100644 --- a/databags/menu_footer+tr.ini +++ b/databags/menu_footer+tr.ini @@ -1,15 +1,15 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/tr/about/jobs label = Jobs [blog] path = https://blog.torproject.org -label = Blog +label = Günlük [contact] -path = ttps://www.torproject.org/contact -label = Contact +path = https://www.torproject.org/tr/contact +label = İletişim [press] -path = ttps://www.torproject.org/press -label = Press +path = https://www.torproject.org/press +label = Basın diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini index e66659d..03fdd21 100644 --- a/databags/menu_footer+zh-CN.ini +++ b/databags/menu_footer+zh-CN.ini @@ -1,15 +1,15 @@ [jobs] -path = ttps://www.torproject.org/about/jobs +path = https://www.torproject.org/zh-CN/about/jobs label = Jobs [blog] path = https://blog.torproject.org -label = Blog +label = 博客 [contact] -path = ttps://www.torproject.org/contact -label = Contact +path = https://www.torproject.org/zh-CN/contact +label = 联系方式 [press] -path = ttps://www.torproject.org/press -label = Press +path = https://www.torproject.org/zh-CN/press +label = 新闻 diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini index 43f44fd..da730a8 100644 --- a/databags/pagenav+fr.ini +++ b/databags/pagenav+fr.ini @@ -1,17 +1,17 @@ [history] -path = about/history +path = fr/about/history label = History [people] -path = about/people +path = fr/about/people label = People [sponsors] -path = about/sponsors +path = fr/about/sponsors label = Sponsors [reports] -path = about/reports +path = fr/about/reports label = Reports [jobs]

1 0

[community/staging] move https://tb-manual.torproject.org/becoming-tor-translator/ to here
by emmapeel＠torproject.org 27 May '19

27 May '19

commit f49ee10522aad3449bfbd4ec41a57b938ae53b94 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 10:51:09 2019 +0100 move https://tb-manual.torproject.org/becoming-tor-translator/ to here --- .../becoming-tor-translator/contents.lr | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/content/localization/becoming-tor-translator/contents.lr b/content/localization/becoming-tor-translator/contents.lr new file mode 100644 index 0000000..8ff3d5e --- /dev/null +++ b/content/localization/becoming-tor-translator/contents.lr @@ -0,0 +1,54 @@ +_section: localization +--- +section_id: localization +--- +color: primary +--- +_template: layout.html +--- +title: Translate Tor Software +--- +subtitle: Becoming a translator for the Tor Project +--- +--- +key: 13 +--- +html: localization.html +--- +body: + +If you are interested in helping out the project by translating the manual or the Tor Browser to your language, your help would be greatly appreciated! Tor Project localization is hosted in the [Localization Lab](https://www.localizationlab.org) Hub on Transifex, a third-party translation tool. In order to begin contributing you will have to sign up with Transifex. Below is an outline of how to sign up and begin. + +Before translating, please read through the Tor Project page on the [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor). There you will find translation guidelines and resources that will help you contribute to Tor translations. + +##### Signing up on Transifex + +* Head over to the [Transifex signup page](https://transifex.com/signup/). + Enter your information into the fields and click the 'Sign Up' button: + +<img class="col-md-6" src="../../static/images/tr1.png"> + +* Fill out the next page with your name and select "Localization" and "Translator" from the drop-down menus: + +<img class="col-md-6" src="../../static/images/tr2.png"> + +* On the next page, select 'Join an existing project' and continue. +* On the next page, select the languages you speak from the drop-down menu and continue. +* You are now signed up! Go to the [Tor Transifex page](https://www.transifex.com/otf/torproject/). +* Click the blue 'Join Team' button on the far right: + +<img class="col-md-6" src="../../static/images/tr3.png"> + +* Select the language you would like to translate from the dropdown menu: + +<img class="col-md-6" src="../../static/images/tr4.png"> + +* A notification will now show up on the top of the page like so: + +<img class="col-md-6" src="../../static/images/tr5.png"> + +After your membership is approved you can begin translating; there is a list of needed translations at [Tor Transifex page](https://www.transifex.com/otf/torproject/) when you are ready to begin. + +The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) also has information about the translations with bigger priority. + +Thanks for your interest in helping the project!

1 0

[community/staging] matching string with standard spelling
by emmapeel＠torproject.org 27 May '19

27 May '19

commit 5e2c2ef509edbdb674944833f4b7a9fe5346b2e8 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 10:52:32 2019 +0100 matching string with standard spelling --- content/user-testing/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/user-testing/contents.lr b/content/user-testing/contents.lr index 453f185..b563916 100644 --- a/content/user-testing/contents.lr +++ b/content/user-testing/contents.lr @@ -1,4 +1,4 @@ -section: user testing +section: User Testing --- section_id: user-testing ---

1 0

[community/staging] better links and words for German
by emmapeel＠torproject.org 27 May '19

27 May '19

commit 1d5d430e5d7e8d2ee92bfa4aaba2fc956d2ff2fa Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 12:45:57 2019 +0100 better links and words for German --- databags/menu+de.ini | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/databags/menu+de.ini b/databags/menu+de.ini index 6aae1f0..e998233 100644 --- a/databags/menu+de.ini +++ b/databags/menu+de.ini @@ -1,19 +1,19 @@ [about] path = https://www.torproject.org/de/about/history -label = About +label = Infos [documentation] path = https://www.torproject.org/docs/documentation.html.en -label = Documentation +label = Dokumentation [support] -path = https://support.torproject.org/de -label = Support +path = https://support.torproject.org/de/ +label = Unterstützung [blog] path = https://blog.torproject.org label = Blog [donate] -path = https://donate.torproject.org/de -label = Donate +path = https://donate.torproject.org/de/ +label = Spenden

1 0

[community/staging] support for rtl languages
by emmapeel＠torproject.org 27 May '19

27 May '19

commit 8ace0d336388a3b1d4df1c8d10e0e963c1495a35 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 10:44:43 2019 +0100 support for rtl languages --- templates/layout.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/layout.html b/templates/layout.html index bdc039b..9f0507f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,4 +1,5 @@ <!doctype html> +<html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="stylesheet" href="{{ '/static/bootstrap.css'|asseturl }}"> @@ -27,3 +28,4 @@ {% include 'footer.html' %} </footer> </body> +</html>

1 0

[community/staging] better link
by emmapeel＠torproject.org 27 May '19

27 May '19

commit 886220514acf3421b7c6ee0866b7f6eaee046e6a Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 09:36:15 2019 +0100 better link --- databags/menu+ar.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/menu+ar.ini b/databags/menu+ar.ini index a2e7848..bc6e4a5 100644 --- a/databags/menu+ar.ini +++ b/databags/menu+ar.ini @@ -1,5 +1,5 @@ [about] -path = https://www.torproject.org/about/history +path = https://www.torproject.org/ar/about/history label = About [documentation]

1 0

[community/staging] clean up lang specific files
by emmapeel＠torproject.org 27 May '19

27 May '19

commit ec7f41d5f5fe34a135d3468b297a0abf6eec8163 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 12:47:15 2019 +0100 clean up lang specific files --- content/onion-services/contents+fr.lr | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/content/onion-services/contents+fr.lr b/content/onion-services/contents+fr.lr deleted file mode 100644 index b862a5d..0000000 --- a/content/onion-services/contents+fr.lr +++ /dev/null @@ -1,17 +0,0 @@ -section: onion services ---- -section_id: onion-services ---- -color: primary ---- -_template: layout.html ---- -title: .onion Services ---- -subtitle: Onion services help you and your users defeat surveillance and censorship. Learn how you can deploy onion services. ---- -key: 6 ---- -html: onion-services.html ---- -body:

1 0

[community/staging] add initial relay guide content (incomplete)
by emmapeel＠torproject.org 27 May '19

27 May '19

commit f9a99af58d4ece35e490ac58e1a71f3a72c28d17 Author: nusenu <nusenu-github(a)riseup.net> Date: Sat Apr 27 18:07:10 2019 +0000 add initial relay guide content (incomplete) --- .../relays-requirements/contents.lr | 82 ++- .../relay-operations/technical-setup/contents.lr | 564 +++++++++++++++++++++ .../relay-operations/types-of-relays/contents.lr | 77 +++ templates/relay-operations.html | 23 - 4 files changed, 722 insertions(+), 24 deletions(-) diff --git a/content/relay-operations/relays-requirements/contents.lr b/content/relay-operations/relays-requirements/contents.lr index 4e672f6..a4349d1 100644 --- a/content/relay-operations/relays-requirements/contents.lr +++ b/content/relay-operations/relays-requirements/contents.lr @@ -6,7 +6,7 @@ color: primary --- _template: layout.html --- -title: Relays requirements +title: Relay requirements --- subtitle: Requirements for Tor relays depend on the type of relay and the bandwidth they provide. Learn more about specific relay requirements. --- @@ -15,3 +15,83 @@ key: 2 html: relay-operations.html --- body: + +Requirements for Tor relays depend on the type of relay and the bandwidth they +provide. + +# Bandwidth and Connections + +A non-exit relay should be able to handle at least 7000 concurrent +connections. This can overwhelm consumer-level routers. If you run the Tor +relay from a server (virtual or dedicated) in a data center you will be fine. +If you run it behind a consumer-level router at home you will have to try and +see if your home router can handle it or if it starts failing. Fast exit +relays (>=100 Mbit/s) usually have to handle a lot more concurrent connections +(>100k). + +It is recommended that a relay have at least 16 Mbit/s (Mbps) upload bandwidth +and 16 Mbit/s (Mbps) download bandwidth available for Tor. More is better. The +minimum requirements for a relay are 10 Mbit/s (Mbps). If you have less than 10 +Mbit/s but at least 1 Mbit/s we recommend you run a [bridge with obfs4 +support](https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy). +If you do not know your bandwidth you can use http://beta.speedtest.net to +measure it. + +# Monthly Outbound Traffic + +It is required that a Tor relay be allowed to use a minimum of 100 GByte of +outbound traffic (and the same amount of incoming traffic) per month. Note: That +is only about 1 day worth of traffic on a 10 Mbit/s (Mbps) connection. More (>2 +TB/month) is better and recommended. **Ideally a relay runs on an unmetered plan** +or includes 20 TB/month or more. If you have a metered plan you might want to +configure tor to only use a given amount of [bandwidth or monthly traffic](FIXME). + +# Public IPv4 Address + +Every relay needs a public IPv4 address - either directly on the host +(preferred) or via NAT and port forwarding. + +The IPv4 address is not required to be static but static IP addresses are +preferred. Your IPv4 address should remain unchanged for at least 3 hours (if it +regularly changes more often than that, it does not make much sense to run a +relay or bridge there since it takes time to distribute the new list of relay +IPs to clients - which happens only once every hour). + +Additional IPv6 connectivity is great and recommended/encouraged but not a +requirement. There should be no problem at all with this requirement (all +commercially available servers come with at least one IPv4 address). + +Note: You can only run two Tor relays per public IPv4 address. If you want to +run more than two relays you will need more IPv4 addresses. + +# Memory Requirements + +* A <40 Mbit/s non-exit relay should have at least 512 MB of RAM available. +* A non-exit relay faster than 40 Mbit/s should have at least 1 GB of RAM. +* On an exit relay we recommend at least 1.5 GB of RAM per tor instance. + +# Disk Storage + +Tor does not need much disk storage. A typical Tor relay needs less than 200 MB +for Tor related data (in addition to the operating system itself). + +# CPU + +* Any modern CPU should be fine. +* It is recommended to use CPUs with AESNI support (that will improve performance +and allow for up to about ~400-450 Mbps in each direction on a single tor +instance on modern CPUs). If the file /proc/cpuinfo contains the word aes your +CPU has support for AES-NI. + +# Uptime + +Tor has no hard uptime requirement but if your relay is not running for more +than 2 hours a day its usefulness is limited. Ideally the relay runs on a server +which runs 24/7. Reboots and tor daemon restarts are fine. + +# Tor Version + +For security reasons, Tor relays should not downgrade their tor version from a +supported to an unsupported version of tor. Some unsupported versions are +insecure. Relays that attempt to downgrade to an insecure version will be +rejected from the network automatically. diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index 5016702..d7af9b1 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -15,3 +15,567 @@ key: 3 html: relay-operations.html --- body: + +# Considerations when choosing a hosting provider + +If you have access to a high speed internet connection (>=100 Mbit/s in both +directions) and a physical piece of computer hardware, this is the best way to +run a relay. Having full control over the hardware and connection gives you a +more controllable and (if done correctly) secure environment. You can host your +own physical hardware at home (do NOT run a Tor exit relay from your home) or in +a data center. Sometimes this is referred to as installing the relay on "bare +metal". + +If you do not own physical hardware, you could run a relay on a rented dedicated +server or virtual private server (VPS). This can cost anywhere between +$3.00/month and thousands per month, depending on your provider, hardware +configuration, and bandwidth usage. Many VPS providers will not allow you to run +exit relays. You must follow the VPS provider's terms of service, or risk having +your account disabled. For more information on hosting providers and their +policies on allowing Tor relays, please see this list maintained by the Tor +community: [GoodBadISPs](FIXME). + +## Questions to consider when choosing a hoster + +* How much monthly traffic is included? (Is bandwidth "unmetered"?) +* Does the hoster provide IPv6 connectivity? (it is recommended, but not required) +* What virtualization / hypervisor (if any) does the provider use? (anything but OpenVZ should be fine) +* Does the hoster start to throttle bandwidth after a certain amount of traffic? +* How well connected is the autonomous system of the hoster? To answer this +question you can use the AS rank of the autonomous systems if you want to +compare: http://as-rank.caida.org/ (a lower value is better) + +## If you plan to run Exit Relays + +* Does the hoster allow Tor exit relays? (explicitly ask them before starting an +exit relay there) +* Does the hoster allow custom WHOIS records for your IP addresses? This helps +reduce the amount of abuse sent to the hoster instead of you. +* Does the hoster allow you to set a custom DNS reverse entry? (DNS PTR record) +This are probably things you will need to ask the hoster in a Pre-Sales ticket + +# AS/location diversity + +When selecting your hosting provider, consider network diversity on an +autonomous system (AS) and country level. A more diverse network is more +resilient to attacks and outages. Sometimes it is not clear which AS you are +buying from in case of resellers. To be sure it is best to ask the hoster about +the AS number before ordering a server. + +It is best to avoid hosters where many Tor relays are already hosted, but it is +still better to add one there than to run no relay at all. **Try to avoid** the +following hoster: + +* OVH SAS (AS16276) +* Online S.a.s. (AS12876) +* Hetzner Online GmbH (AS24940) +* DigitalOcean, LLC (AS14061) + +To find out which hoster and countries are already used by many other operators +(that should be avoided) you can use Relay Search: + +* [Autonomous System Level +Overview](https://metrics.torproject.org/rs.html#aggregate/as) +* [Country Level Overview](https://metrics.torproject.org/rs.html#aggregate/cc) + +# Choosing an Operating System + +We recommend you use the operating system you are most familiar with. Please +keep in mind that since most relays run on Debian and we want to avoid a +monoculture, BSD and other non-Linux based relays are greatly needed. + +The following table shows the current OS distribution on the Tor network to give +you an idea of how much more non-Linux relays we should have: + +* https://nusenu.github.io/OrNetStats/#os-distribution-relays + +# OS Level Configuration + +OS configuration is outside the scope of this guide but the following points are +crucial for a Tor relay, so we want to mention them here nonetheless. + +## Time Synchronization (NTP) + +Correct time settings are essential for Tor relays. It is recommended that you +use the network time protocol (NTP) for time synchronization and ensure your +timezone is set correctly. + +## Automatic Software Updates + +One of the most imported things to keeps your relay secure is to install +security updates timely and ideally automatically so you can not forget about +it. We collected the steps to enable automatic software updates for different +operating systems: + +* [RPM-based distributions](FIXME) (RHEL, CentOS, Fedora, openSUSE) +* [Debian/Ubuntu](FIXME) +* [FreeBSD/HardenedBSD](FIXME) + +# Tor Relay Setup: Installation and Configuration + +This section covers the installation and configuration of the program required +to run a Tor relay for various operating systems. These steps are intended for +the latest stable version of the given OS, on Ubuntu for the latest LTS release. + +Note: For some operating systems, there are alpha version packages available +(tor versions with new features not deemed to be stable yet). These are only +recommended for people eager to test and report bugs in bleeding edge +releases/features. If you are looking to run a relay with minimal effort we +recommend you stick to stable releases. + +In this guide we describe how to setup a new non-exit relay. By reading further +you can easily switch to become an exit relay. + +**Questions you should clarify before configuring Tor:** + +* Do you want to run a Tor exit or non-exit (guard/middle) relay? +* If you want to run an exit relay: Which ports do you want to allow in your +exit policy? (more ports usually means potentially more abuse complains) +* What external TCP port do you want to use for incoming Tor connections? +("ORPort" configuration, we recommend port 443 if that is not used by another +daemon on your server already. ORPort 443 is recommended because it is often one +of the few open ports on public WIFI networks. Port 9001 is another commonly used ORPort.) +* What email address will you use in the ContactInfo field of your relay(s)? +Note: This information will be made public. +* How much bandwidth/monthly traffic do you want to allow for Tor traffic? +* Does the server have an IPv6 address? + +The installation commands are shown in code blocks and must be executed with root privileges. + +## Make sure relay ports can be reached + +If you are using a firewall, open a hole in your firewall so incoming +connections can reach the ports you will use for your relay (ORPort, plus +DirPort if you enabled it). Also, make sure you allow all outgoing connections +too, so your relay can reach the other Tor relays, clients and destinations. You +can find the specific ORPort TCP port number in the torrc configuration samples +bellow (in the OS specific sections). + +## Configuration Management + +Tor does not scale well on multi-core machines. If you run a Tor relay on a +server with a fast Internet uplink (>200 Mbit/s) you might want to consider +running multiple Tor instances on a single server with multiple cores. Note: You +can only run two tor instances per public IPv4 address. + +If you plan to run more than a single relay, or you want to run a high capacity +relay (multiple Tor instances per server) or want to use strong security +features like [Offline Master +Keys](https://trac.torproject.org/projects/tor/wiki/doc/TorRelaySecurity/OfflineKeys) +without performing additional steps manually, you may want to use a configuration +management for better maintainability. + +There are multiple configuration management solutions for Unix based operating +systems (Ansible, Puppet, Salt, ...). + +The following Ansible Role has specifically been build for Tor relay operators +and supports multiple operating systems: + +http://github.com/nusenu/ansible-relayor + +## Platform specific Instructions + +Please choose your platform: + +* Debian/Ubuntu +* CentOS/RHEL +* Fedora +* FreeBSD +* openSUSE + +## Verify that your relay works + +If your logfile (syslog) contains the following entry after starting your tor +daemon your relay should be up and running as expected: + +``` +Self-testing indicates your ORPort is reachable from the outside. Excellent. +Publishing server descriptor. +``` + +About 3 hours after you started your relay it should appear on +[Relay Search](https://metrics.torproject.org/rs.html). You can search for your +relay using your nickname or IP address. + +# Getting Help + +If you run into problems while setting up your relay you can ask your questions +on the public tor-relays mailing list: + +* https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays + +This is a great resource for asking (and answering) questions, and generally +getting to know other relay operators. Make sure to check out the archives! + +# Limiting bandwidth usage (and traffic) + +Tor will not limit its bandwidth usage by default, but supports multiple ways to +restrict the used bandwidth and the amount of traffic. This can be handy if you +want to ensure that your Tor relay does not exceed a certain amount of bandwidth +or total traffic per day/week/month. The following torrc configuration options +can be used to restrict bandwidth and traffic: + +* AccountingMax +* AccountingRule +* AccountingStart +* BandwidthRate +* BandwidthBurst +* RelayBandwidthRate + +Having a fast relay for some time of the month is preferred over a slow relay +for the entire month. + +Also see the bandwidth entry in the FAQ: https://www.torproject.org/docs/faq.html.en#BandwidthShaping + +# IPv6 + +We encourage everyone to enable IPv6 on their relays. This is especially +valuable on exit and guard relays. + +Before enabling your tor daemon to use IPv6 in addition to IPv4 you should do +some basic IPv6 connectivity tests. + +he following command line will ping the IPv6 addresses of Tor directory +authorities from your server: + +``` +ping6 -c2 2001:858:2:2:aabb:0:563b:1526 && ping6 -c2 2620:13:4000:6000::1000:118 && ping6 -c2 2001:67c:289c::9 && ping6 -c2 2001:678:558:1000::244 && ping6 -c2 2607:8500:154::3 && ping6 -c2 2001:638:a000:4140::ffff:189 && echo OK. +``` + +At the end of the output you should see "OK." if that is not the case do not +enable IPv6 in your torrc configuration file before IPv6 is indeed working. If +you enable IPv6 without working IPv6 connectivity your entire relay will not be +used, regardless if IPv4 is working. + +If it worked fine, make your Tor relay reachable via IPv6 by adding an +additional ORPort line to your configuration (example for ORPort 9001): + +``` +ORPort [IPv6-address]:9001 +``` + +The location of that line in the configuration file does not matter you can +simply add it next to the first ORPort lins in your torrc file. + +Note: You have to explicitly specify your IPv6 address in square brackets, you +can not tell tor to bind to any IPv6 (like you do for IPv4). If you have a +global IPv6 address you should be able to find it in the output of the following +command: + +``` +ip addr|grep inet6|grep global +``` + +If you are an exit relay with IPv6 connectivity, tell your tor daemon to allow +exiting via IPv6 so clients can reach IPv6 destinations: + +``` +IPv6Exit 1 +``` + +Note: Tor requires IPv4 connectivity, you can not run a Tor relay on IPv6-only. + +# Important if you run more than one Tor instance + +To avoid putting Tor clients at risk when operating multiple relays you must set +a proper [MyFamily](https://2019.www.torproject.org/docs/tor-manual.html.en#MyFamily) +value and have a valid [ContactInfo](https://2019.www.torproject.org/docs/tor-manual.html.en#Contac… +in your torrc configuration. The MyFamily setting is simply telling Tor clients what Tor +relays are controlled by a single entity/operator/organization, so they don't +use them in multiple position in a single circuit. + +If you run two relays and they have fingerprints AAAAAAAAAA and BBBBBBBB, you +would add the following configuration to set MyFamily: + +``` +MyFamily AAAAAAAAAA,BBBBBBBB +``` + +to both relays. To find your relays fingerprint you can look into the log files +when tor starts up or find the file named "fingerprint" in your tor +DataDirectory. + +Instead of doing so manually for big operators we recommend to automate the +MyFamily setting via a configuration management solution. Manually managing +MyFamily for big relaygroups is error prone and can put Tor clients at risk. + +# Exit Relay Configuration + +It is recommended that you setup exit relays on servers dedicated to this +purpose. It is not recommended to install Tor exit relays on servers that you +need for other services as well. Do not mix your own traffic with your exit +relay traffic. + +## Reverse DNS and WHOIS record + +Before switching your relay to become an exit relay, ensure that you have set a +clear DNS reverse (PTR) record to make it clear for everyone that this is a tor +exit relay. Something like "tor-exit" it its name is a good start. + +If your provider offers it, make sure your WHOIS record contains clear +indications that this is a Tor exit relay. + +## Exit Notice HTML page + +To make it even more obvious that this is a Tor exit relay you should serve a +Tor exit notice HTML page. Tor can do that for you if your DirPort is on TCP +port 80, you can make use of tor's DirPortFrontPage feature to display a +HTML file on that port. This file will be shown to anyone directing his browser +to your Tor exit relay IP address. + +``` +DirPort 80 +DirPortFrontPage /path/to/html/file +``` + +We offer a sample Tor exit notice HTML file, but you might want to adjust it to +your needs: +https://gitweb.torproject.org/tor.git/plain/contrib/operator-tools/tor-exit-notice.html + +Here are some more tips for running a reliable exit relay: +https://blog.torproject.org/tips-running-exit-node + +## Exit Policy + +Defining the [exit +policy](https://www.torproject.org/docs/tor-manual.html.en#ExitPolicy) +is one of the most important parts of an exit relay configuration. The exit +policy defines which destination ports you are willing to forward. This has an +impact on the amount of abuse emails you will get (less ports means less abuse +emails, but an exit relay allowing only few ports is also less useful). If you +want to be a useful exit relay you must **at least allow destination ports 80 +and 443**. + +As a new exit relay - especially if you are new to your hoster - it is good to +start with a reduced exit policy (to reduce the amount of abuse emails) and +further open it up as you become more experienced. The reduced exit policy can +be found on the +[ReducedExitPolicy](https://trac.torproject.org/projects/tor/wiki/doc/ReducedExitPolicy) +wiki page. + +To become an exit relay change ExitRelay from 0 to 1 in your torrc configuration +file and restart the tor daemon. + +``` +ExitRelay 1 +``` + +## DNS on Exit Relays + +Unlike other types of relays, exit relays also do DNS resolution for Tor +clients. DNS resolution on exit relays is crucial for Tor clients, it should be +reliable and fast by using caching. + +* DNS resolution can have a significant impact on the performance and reliability your exit relay provides. Poor DNS performance will result in less traffic going through your exit relay. +* Don't use any of the big DNS resolvers as your primary or fallback DNS resolver to avoid centralization (Google, OpenDNS, Quad9, Cloudflare, 4.2.2.1-6) +* We recommend running a local caching and DNSSEC-validating resolver without using any forwarders (specific instructions follow bellow for each operating systems) +* if you want to add a second DNS resolver as a fallback to your /etc/resolv.conf configuration, try to choose a resolver within your autonomous system and make sure it is not your first entry in that file (the first entry should be your local resolver) +* if a local resolver like unbound is not an option for you try to use a resolver that your provider runs in the same autonomous system (to find out if an IP address is in the same AS as your relay, you can look it up, using for example https://bgp.he.net) +* try to avoid adding too many resolvers to your /etc/resolv.conf file to limit exposure on an AS-level (try to not use more than two entries) + +There are multiple options for DNS server software, unbound has become a popular +one but **feel free to use any other you are comfortable with**. When choosing your +DNS resolver software try to ensure it supports DNSSEC validation and QNAME +minimisation (RFC7816). In every case the software should be installed +using the OS package manager to ensure it is updated with the rest of the +system. + +By using your own DNS resolver you are less vulnerable to DNS-based censorship +that your upstream resolver might impose. + +Here follow specific instructions on how to install and configure unbound on +your exit - a DNSSEC-validating and caching resolver. unbound has many +configuration and tuning nobs but we try to keep these instructions as simple +and short as possible and the basic setup will do just fine for most operators. + +After switching to unbound verify it works as expected by resolving a valid +hostname, if it does not work, you can restore the old resolv.conf file. + +### Debian/Ubuntu + +The following 3 commands install unbound, backup your DNS configuration and tell +the system to use the local unbound: + +``` +apt install unbound +cp /etc/resolv.conf /etc/resolv.conf.backup +echo nameserver 127.0.0.1 > /etc/resolv.conf +``` + +To avoid that the configuration gets changed (for example by the DHCP client): + +``` +chattr +i /etc/resolv.conf +``` + +The Debian configuration ships with QNAME minimisation (RFC7816) enabled +by default so you don't need to enable it explicitly. The unbound resolver you +just installed does also DNSSEC validation. + +### CentOS/RHEL + +Install the unbound package: + +``` +yum install unbound +``` + +in /etc/unbound/unbound.conf replace the line + +``` +# qname-minimisation: no +``` + +with: + +``` +qname-minimisation: yes +``` + +enable and start unbound: + +``` +systemctl enable unbound +systemctl start unbound +``` + +Tell the system to use the local unbound server: + +``` +cp /etc/resolv.conf /etc/resolv.conf.backup +echo nameserver 127.0.0.1 > /etc/resolv.conf +``` + +To avoid that the configuration gets changed (for example by the DHCP client): + +``` +chattr +i /etc/resolv.conf +``` + +### FreeBSD + +FreeBSD ships unbound in the base system but the one in ports is usually +following upstream more closely so we install the unbound package: + +``` +pkg install unbound +``` + +Replace the content in /usr/local/etc/unbound/unbound.conf with the following lines: + +``` +server: + verbosity: 1 + qname-minimisation: yes +``` + +enable and start the unbound service: + +``` +sysrc unbound_enable=YES +service unbound start +``` + +Tell the system to use the local unbound server: + +``` +cp /etc/resolv.conf /etc/resolv.conf.backup +echo nameserver 127.0.0.1 > /etc/resolv.conf +``` + +To avoid that the configuration gets changed (for example by the DHCP client): + +``` +chflags schg /etc/resolv.conf +``` + +# Tor relay lifecycle + +It takes some time for relay traffic to ramp up, this is especially true for +guard relays but to a lesser extend also for exit relays. To understand this +process, read about the lifecycle of a new relay: +https://blog.torproject.org/lifecycle-new-relay + +# Maintaining a relay + +## Backup Tor Identity Keys + +After your initial installation and start of the tor daemon it is a good idea to +make a backup of your relay's long term identity keys. They are located in the +"keys" subfolder of your DataDirectory (simply make a copy of the entire folder +and store it in a secure location). Since relays have a ramp-up time it makes +sense to backup the identity key to be able to restore your relay's reputation +after a disk failure - otherwise you would have to go through the ramp-up phase +again. + +Default locations of the keys folder: + +* Debian/Ubuntu: `/var/lib/tor/keys` +* FreeBSD: `/var/db/tor/keys` + +## Subscribe to the tor-announce mailing list + +This is a very low traffic mailing list and you will get information about new +stable tor releases and important security update information. + +* https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-announce + +## Setting up outage notifications + +Once you setup your relay it will likely run without much work from your side. +If something goes wrong it is good to get notified automatically. We recommend +you use one of the free services that allow you to check your relay's ORPorts +for reachability and send you an email should they become unreachable for what +ever reason. + +UptimeRobot is one of these services that allow you to monitor TCP listeners on +arbitrary ports. This service can check your configured ports once every 5 +minutes and send you an email should your tor process die or become unreachable. +This checks only for the listener but does not speak the Tor protocol. + +* https://uptimerobot.com/ + +A good way to monitor a relay for its health state is to have a look at its +bandwidth graphs. + +## System Health Monitoring + +To ensure your relay is healthy and not overwhelmed it makes sense to have some +basic system monitoring in place to keep an eye on the following metrics: + +* Bandwidth +* Established TCP Connections +* Memory +* Swap +* CPU + +There are many tools for monitoring this kind of data, munin is one of them and +is relatively easy to setup. + +Note: **Do not make your private monitoring data graphs public since this could +help attackers with deanonymizing Tor users.** + +Some practical advice: + +* If you want to publish traffic statistics, you should aggregate all your relays' traffic over at least a week, then round that to the nearest 10 TiB (terabytes). +* Reporting individual relays is worse than reporting totals for groups of relays. In future, tor will securely aggregate bandwidth statistics, so any individual relay bandwidth reporting will be less secure than tor's statistics. +* Smaller periods are worse. +* Numbers are worse than graphs. +* Real-time data is worse than historical data. +* Data in categories (IP version, in/out, etc.) is worse than total data. + +## Tools + + This section listsm a few tools that you might find handy as a Tor relay operator. + +Nyx: [Nyx](https://nyx.torproject.org/) is a Tor Project tool (formerly arm) +that allows you to see real time data of your relay. + +vnstat: vnstat is a command-line tool that shows the amount of data going +through your network connection. You can also use it to generate PNG pictures +showing traffic graphs. + +vnstat documentation and demo output: + +* https://humdi.net/vnstat/ +* https://humdi.net/vnstat/cgidemo/ diff --git a/content/relay-operations/types-of-relays/contents.lr b/content/relay-operations/types-of-relays/contents.lr index ba96bf0..f78a338 100644 --- a/content/relay-operations/types-of-relays/contents.lr +++ b/content/relay-operations/types-of-relays/contents.lr @@ -15,3 +15,80 @@ key: 1 html: relay-operations.html --- body: + +All nodes are important, but they have different technical requirements and +legal implications. Understanding the different kinds of nodes is the first step +to learning which one is right for you. + +# Guard and middle relay + +(also known as non-exit relays) + +A guard relay is the first relay in the chain of 3 relays building a Tor circuit. A +middle relay is neither a guard nor an exit, but acts as the second hop between +the two. To become a guard, a relay has to be stable and fast (at least +2MByte/s) otherwise it will remain a middle relay. + +Guard and middle relays usually do not receive abuse complaints. All relays will +be listed in the public list of Tor relays, so may be blocked by certain +services that don't understand how Tor works or deliberately want to censor Tor +users. If you are running a relay from home and have one static IP, you may want +to consider running a bridge instead so that your non-Tor traffic doesn't get +blocked as though it's coming from Tor. If you have a dynamic IP address or +multiple static IPs, this isn't as much of an issue. + +A non-exit Tor relay requires minimal maintenance efforts and bandwidth usage +can be highly customized in the tor configuration (will be covered in more +detail later in this guide). The so called "exit policy" of the relay decides if +it is a relay allowing clients to exit or not. A non-exit relay does not allow +exiting in its exit policy. + +# Exit relay + +The exit relay is the final relay in a Tor circuit, the one that sends traffic +out its destination. The services Tor clients are connecting to (website, chat +service, email provider, etc) will see the IP address of the exit relay instead +of their real IP address of the Tor user. + +Exit relays have the greatest legal exposure and liability of all the relays. +For example, if a user downloads copyrighted material while using your exit +relay, you the operator may receive a +[DMCA notice](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-ba92… +. Any abuse complaints about the exit will go directly to you (via your +hoster, depending on the WHOIS records). Generally, most complaints can be +handled pretty easily through template letters, which we'll discuss more in +legal considerations section. + +Because of the legal exposure that comes with running an exit relay, you should +not run a Tor exit relay from your home. Ideal exit relay operators are +affiliated with some institution, like a university, a library, a hackerspace or +a privacy related organization. An institution can not only provide greater +bandwidth for the exit, but is better positioned to handle abuse complaints or +the rare law enforcement inquiry. + +If you are considering running an exit relay, please read the [section on legal +considerations](FIXME) for exit relay operators. + +# Bridge + +The design of the Tor network means that the IP address of Tor relays is public. +However, one of the ways Tor can be blocked by governments or ISPs is by +blacklisting the IP addresses of these public Tor nodes. Tor bridges are nodes +in the network that are not listed in the public Tor directory, which make it +harder for ISPs and governments to block them. + +Bridges are useful for Tor users under oppressive regimes or for people who want +an extra layer of security because they're worried somebody will recognize that +they are contacting a public Tor relay IP address. Several countries, including +China and Iran, have found ways to detect and block connections to Tor bridges. +Pluggable transports +(https://www.torproject.org/docs/pluggable-transports.html.en), a special +kind of bridge, address this by adding an additional layer of obfuscation. + +Bridges are relatively easy, low-risk and low bandwidth Tor nodes to operate, +but they have a big impact on users. A bridge isn't likely to receive any abuse +complaints, and since bridges are not listed in the public consensus, they are +unlikely to be blocked by popular services. Bridges are a great option if you +can only run a Tor node from your home network, have only one static IP, and +don't have a huge amount of bandwidth to donate -- we recommend giving your +bridge at least 1 Mbit/sec. diff --git a/templates/relay-operations.html b/templates/relay-operations.html index b964ab7..7fa9c8c 100644 --- a/templates/relay-operations.html +++ b/templates/relay-operations.html @@ -1,5 +1,4 @@ <div class="container py-5"> - <h2 class="text-primary">{{ _('Why run a Tor Relay?') }}</h2> <div class="row py-5"> <div class="col-8"> {{ this.body }} @@ -8,7 +7,6 @@ <p>Illustration area</p> </div> </div> - <h2 class="text-primary">{{ _('How to run a Relay?') }}</h2> <div class="row py-5"> {% for child in this.children|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> @@ -22,25 +20,4 @@ </div> {% endfor %} </div> - <h2 class="text-primary text-center">{{ _('Can\'t run a relay yourself?') }}</h2> - <p class="text-center">{{ _('You can donate to these organizations that help relay operators:') }}</p> - <div class="row"> - <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> - <div class="card h-100 border-1"> - <img class="card-img-top" src="{{ 'static/images/gray-image.png'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <h4 class="card-title text-primary">{{ _('Tor Servers') }}</h4> - <p class="card-text">{{ _('Two lines about the here. Two lines about the here. Two lines about the here. Two lines about the here.')}}</p> - </div> - </div> - </div> - <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-4"> - <div class="card h-100 border-1"> - <img class="card-img-top" src="{{ 'static/images/gray-image.png'|asseturl }}" alt="Card image cap"> - <div class="card-body"> - <h4 class="card-title text-primary">{{ _('Nos Ognions') }}</h4> - <p class="card-text">{{ _('Two lines about the here. Two lines about the here. Two lines about the here. Two lines about the here.') }} </p> - </div> - </div> - </div> </div>

1 0

[community/staging] clean up lang specific files
by emmapeel＠torproject.org 27 May '19

27 May '19

commit 48523a1e7e4f31bdbcc4b4e0e6871b4d54a5a9b8 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 15:06:29 2019 +0100 clean up lang specific files --- content/localization/contents+en.lr | 17 ----------------- content/localization/contents+fr.lr | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/content/localization/contents+en.lr b/content/localization/contents+en.lr deleted file mode 100644 index b483d03..0000000 --- a/content/localization/contents+en.lr +++ /dev/null @@ -1,17 +0,0 @@ -section: localization ---- -section_id: localization ---- -color: primary ---- -_template: layout.html ---- -title: Join the Tor Community ---- -subtitle: We want Tor to work for everyone in the world, which means a lot of languages. Will you help us to translate? ---- -key: 5 ---- -html: localization.html ---- -body: diff --git a/content/localization/contents+fr.lr b/content/localization/contents+fr.lr deleted file mode 100644 index b483d03..0000000 --- a/content/localization/contents+fr.lr +++ /dev/null @@ -1,17 +0,0 @@ -section: localization ---- -section_id: localization ---- -color: primary ---- -_template: layout.html ---- -title: Join the Tor Community ---- -subtitle: We want Tor to work for everyone in the world, which means a lot of languages. Will you help us to translate? ---- -key: 5 ---- -html: localization.html ---- -body:

1 0

[community/staging] synch links for some langs
by emmapeel＠torproject.org 27 May '19

27 May '19

commit 17c998cf2d6bb9b0fd38c3d70150f99ca72d1392 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 20 13:38:38 2019 +0100 synch links for some langs --- databags/pagenav+ar.ini | 2 +- databags/pagenav+de.ini | 12 ++++++------ databags/pagenav+es.ini | 34 +++++++++++++++++++--------------- databags/pagenav+fr.ini | 34 +++++++++++++++++++--------------- 4 files changed, 45 insertions(+), 37 deletions(-) diff --git a/databags/pagenav+ar.ini b/databags/pagenav+ar.ini index 1ad40f2..2f0f820 100644 --- a/databags/pagenav+ar.ini +++ b/databags/pagenav+ar.ini @@ -20,4 +20,4 @@ label = Translations [onion-services] path = onion-services -label = .Onion Services +label = Onion Services diff --git a/databags/pagenav+de.ini b/databags/pagenav+de.ini index 1ad40f2..ee4a217 100644 --- a/databags/pagenav+de.ini +++ b/databags/pagenav+de.ini @@ -1,23 +1,23 @@ [relay-operations] -path = relay-operations +path = de/relay-operations label = Relay Operations [user-testing] -path = user-testing +path = de/user-testing label = User Testing [training] -path = training +path = de/training label = Training [outreach] -path = outreach +path = de/outreach label = Outreach [translations] -path = translations +path = de/translations label = Translations [onion-services] -path = onion-services +path = de/onion-services label = .Onion Services diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini index 35b81bb..2f0f820 100644 --- a/databags/pagenav+es.ini +++ b/databags/pagenav+es.ini @@ -1,19 +1,23 @@ -[history] -path = es/about/history -label = Historia +[relay-operations] +path = relay-operations +label = Relay Operations -[people] -path = es/about/people -label = Gente +[user-testing] +path = user-testing +label = User Testing -[sponsors] -path = es/about/sponsors -label = Sponsors +[training] +path = training +label = Training -[reports] -path = es/about/reports -label = Informes +[outreach] +path = outreach +label = Outreach -[jobs] -path = es/about/jobs -label = Empleo +[translations] +path = translations +label = Translations + +[onion-services] +path = onion-services +label = Onion Services diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini index da730a8..2f0f820 100644 --- a/databags/pagenav+fr.ini +++ b/databags/pagenav+fr.ini @@ -1,19 +1,23 @@ -[history] -path = fr/about/history -label = History +[relay-operations] +path = relay-operations +label = Relay Operations -[people] -path = fr/about/people -label = People +[user-testing] +path = user-testing +label = User Testing -[sponsors] -path = fr/about/sponsors -label = Sponsors +[training] +path = training +label = Training -[reports] -path = fr/about/reports -label = Reports +[outreach] +path = outreach +label = Outreach -[jobs] -path = about/jobs -label = Jobs +[translations] +path = translations +label = Translations + +[onion-services] +path = onion-services +label = Onion Services

1 0