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

[tor/release-0.4.0] manpage: Clarify that Tor does stream isolation between *Port listeners by default
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 61e6b217c5c83bc49e888f594f931c00c3e9b971 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Mar 25 15:40:46 2019 +0200 manpage: Clarify that Tor does stream isolation between *Port listeners by default cherry-pick of tor-github/pr/841 to maint-0.4.0. --- changes/doc29121 | 3 +++ doc/tor.1.txt | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/doc29121 b/changes/doc29121 new file mode 100644 index 000000000..dd31cc9c7 --- /dev/null +++ b/changes/doc29121 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify that Tor performs stream isolation between *Port listeners by + default. Resolves issue 29121. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ea9942a28..c2df7687f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1230,6 +1230,8 @@ The following options are useful only for clients (that is, if information to anybody watching your network, and allow anybody to use your computer as an open proxy. + + + If multiple entries of this option are present in your configuration + file, Tor will perform stream isolation between listeners by default. The _isolation flags_ arguments give Tor rules for which streams received on this SocksPort are allowed to share circuits with one another. Recognized isolation flags are: @@ -1472,14 +1474,18 @@ The following options are useful only for clients (that is, if protocol instead of SOCKS. Set this to 0 if you don't want to allow "HTTP CONNECT" connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SOCKSPort for an explanation of isolation flags. (Default: 0) [[TransPort]] **TransPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for transparent proxy connections. Set this to 0 if you don't want to allow transparent proxy connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SOCKSPort for an explanation of isolation flags. + + TransPort requires OS support for transparent proxies, such as BSDs' pf or @@ -1516,7 +1522,9 @@ The following options are useful only for clients (that is, if included in old versions of FreeBSD, etc) using the NATD protocol. Use 0 if you don't want to allow NATD connections. Set the port to "auto" to have Tor pick a port for you. This directive can be - specified multiple times to bind to multiple addresses/ports. See + specified multiple times to bind to multiple addresses/ports. If multiple + entries of this option are present in your configuration file, Tor will + perform stream isolation between listeners by default. See SocksPort for an explanation of isolation flags. + + This option is only for people who cannot use TransPort. (Default: 0)

1 0

[tor/release-0.4.0] Improve logging for 28614.
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 5613968d57cb07cc5a66e97c58bd39c22b86a50a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 14:30:56 2019 -0400 Improve logging for 28614. When we fixed 28614, our answer was "if we failed to load the consensus on windows and it had a CRLF, retry it." But we logged the failure at "warn", and we only logged the retry at "info". Now we log the retry at "notice", with more useful information. Fixes bug 30004. --- changes/bug28614_better_logging | 6 ++++++ src/feature/nodelist/networkstatus.c | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/changes/bug28614_better_logging b/changes/bug28614_better_logging new file mode 100644 index 000000000..26d19c3c1 --- /dev/null +++ b/changes/bug28614_better_logging @@ -0,0 +1,6 @@ + o Minor bugfixes (logging): + - On Windows, when errors cause us to reload a consensus from disk, tell + the user that we are retrying at log level "notice". Previously we only + logged this information at "info", which was confusing because the + errors themselves were logged at "warning". Improves previous fix for + 28614. Fixes bug 30004; bugfix on 0.4.0.2-alpha. diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 023115978..a988f700f 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1761,8 +1761,11 @@ reload_consensus_from_file(const char *fname, flavor, flags, source_dir); #ifdef _WIN32 if (rv < 0 && tor_memstr(map->data, map->size, "\r\n")) { - log_info(LD_GENERAL, "Found CRLF in consensus file %s; falling back to " - "read_file_to_string.", escaped(fname)); + log_notice(LD_GENERAL, "Looks like the above failures are probably " + "because of a CRLF in consensus file %s; falling back to " + "read_file_to_string. Nothing to worry about: this file " + "was probably saved by an earlier version of Tor.", + escaped(fname)); char *content = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL); rv = networkstatus_set_current_consensus(content, strlen(content), flavor, flags, source_dir);

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 09 Apr '19

09 Apr '19

commit 2fd02c82edbf98f14ea0ee1a8c4d48ccdb75551f Merge: a51f5b9b3 92e8bdf29 Author: teor <teor(a)torproject.org> Date: Tue Apr 9 11:36:55 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug28614_better_logging | 6 ++++++ changes/doc29121 | 3 +++ doc/tor.1.txt | 14 +++++++++++--- src/feature/nodelist/networkstatus.c | 7 +++++-- 4 files changed, 25 insertions(+), 5 deletions(-)

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 08 Apr '19

08 Apr '19

commit a03c16ebeeaee100736d31b05827db6e140ea2d7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 18:45:11 2019 +0000 Update translations for abouttor-homepage_completed --- nl/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 1c4eb6dd9..db4f75ce1 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -22,9 +22,9 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> -<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3) goede-doelen organisatie die de Rechten en Vrijheden van de Mens bevordert door vrije open source anonimiteit en privacy technology te maken en toe te passen, hun ongerestricteerde beschikbaarheid en gebruik te ondersteunen, en hun wetenschappelijke en populaire begrip te bevorderen."> +<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3)-non-profitorganisatie die de rechten en vrijheden van de mens bevordert door vrije en open source anonimiteits- en privacytechnologie te maken en toe te passen, hun onbeperkte beschikbaarheid en gebruik te steunen, en hun wetenschappelijke en populaire begrip te bevorderen."> <!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste Tor-nieuws direct in uw postvak."> +<!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste nieuws van Tor direct in uw postvak."> <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Apr '19

08 Apr '19

commit 49937caba4d49e378f919c241489043cb11310ba Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 18:45:04 2019 +0000 Update translations for abouttor-homepage --- nl/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 1c4eb6dd9..db4f75ce1 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -22,9 +22,9 @@ <!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> -<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3) goede-doelen organisatie die de Rechten en Vrijheden van de Mens bevordert door vrije open source anonimiteit en privacy technology te maken en toe te passen, hun ongerestricteerde beschikbaarheid en gebruik te ondersteunen, en hun wetenschappelijke en populaire begrip te bevorderen."> +<!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3)-non-profitorganisatie die de rechten en vrijheden van de mens bevordert door vrije en open source anonimiteits- en privacytechnologie te maken en toe te passen, hun onbeperkte beschikbaarheid en gebruik te steunen, en hun wetenschappelijke en populaire begrip te bevorderen."> <!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste Tor-nieuws direct in uw postvak."> +<!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste nieuws van Tor direct in uw postvak."> <!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News.">

1 0

[check/master] Run `go fmt` after 119a476
by arlo＠torproject.org 08 Apr '19

08 Apr '19

commit 8598e5d1a64f8984473669c0735d1bac6cf9db07 Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Apr 8 14:40:27 2019 -0400 Run `go fmt` after 119a476 --- utils.go | 116 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/utils.go b/utils.go index 01ef085..2423025 100644 --- a/utils.go +++ b/utils.go @@ -112,64 +112,64 @@ func GetLocaleList(base string) map[string]string { // populated from https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes // and https://en.wikipedia.org/w/api.php?action=sitematrix&format=json haveTranslatedNames := map[string]string{ - "ar": "العربية", - "bg": "български", - "bn": "বাংলা", - "bs": "Bosanski jezik", - "ca": "Català", - "cs": "Čeština", - "da": "Dansk", - "de": "Deutsch", - "el": "ελληνικά", - "en_GB": "English (United Kingdom)", - "eo": "Esperanto", - "es": "Español", - "es_AR": "Español (Argentina)", - "es_MX": "Español (Mexico)", - "et": "Eesti", - "eu": "Euskara", - "fa": "فارسی", - "fi": "Suomi", - "fr": "Français", - "ga": "Gaeilge", - "he": "עברית", - "hi": "हिन्दी", - "hr": "Hrvatski jezik", - "hr_HR": "Hrvatski jezik (Croatia)", - "hu": "Magyar", - "id": "Bahasa Indonesia", - "is": "íslenska", - "it": "Italiano", - "ja": "日本語", - "ka": "ქართული", - "ko": "한국어", - "lt": "lietuvių kalba", - "lv": "Latviešu valoda", - "mk": "македонски јазик", - "ms_MY": "Bahasa Melayu", - "nb": "Norsk bokmål", - "nl": "Nederlands", - "nl_BE": "Vlaams", - "nn": "Norsk nynorsk", - "pa": "ਪੰਜਾਬੀ", - "pl": "Język polski", - "pt": "Português", - "pt_BR": "Português brasileiro", - "pt_PT": "Português europeu", - "ro": "română", - "ru": "русский язык", - "sk": "Slovenčina", - "sq": "shqip", - "sr": "српски језик", - "sv": "Svenska", - "ta": "தமிழ்", - "th": "ไทย", - "tr": "Türkçe", - "uk": "українська мова", - "vi": "Tiếng Việt", - "zh_CN": "中文简体", - "zh_HK": "中文繁體", - "zh_TW": "中文繁體", + "ar": "العربية", + "bg": "български", + "bn": "বাংলা", + "bs": "Bosanski jezik", + "ca": "Català", + "cs": "Čeština", + "da": "Dansk", + "de": "Deutsch", + "el": "ελληνικά", + "en_GB": "English (United Kingdom)", + "eo": "Esperanto", + "es": "Español", + "es_AR": "Español (Argentina)", + "es_MX": "Español (Mexico)", + "et": "Eesti", + "eu": "Euskara", + "fa": "فارسی", + "fi": "Suomi", + "fr": "Français", + "ga": "Gaeilge", + "he": "עברית", + "hi": "हिन्दी", + "hr": "Hrvatski jezik", + "hr_HR": "Hrvatski jezik (Croatia)", + "hu": "Magyar", + "id": "Bahasa Indonesia", + "is": "íslenska", + "it": "Italiano", + "ja": "日本語", + "ka": "ქართული", + "ko": "한국어", + "lt": "lietuvių kalba", + "lv": "Latviešu valoda", + "mk": "македонски јазик", + "ms_MY": "Bahasa Melayu", + "nb": "Norsk bokmål", + "nl": "Nederlands", + "nl_BE": "Vlaams", + "nn": "Norsk nynorsk", + "pa": "ਪੰਜਾਬੀ", + "pl": "Język polski", + "pt": "Português", + "pt_BR": "Português brasileiro", + "pt_PT": "Português europeu", + "ro": "română", + "ru": "русский язык", + "sk": "Slovenčina", + "sq": "shqip", + "sr": "српски језик", + "sv": "Svenska", + "ta": "தமிழ்", + "th": "ไทย", + "tr": "Türkçe", + "uk": "українська мова", + "vi": "Tiếng Việt", + "zh_CN": "中文简体", + "zh_HK": "中文繁體", + "zh_TW": "中文繁體", } // for all folders in locale which match a locale from https://www.transifex.com/api/2/languages/

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 08 Apr '19

08 Apr '19

commit 0695aa7e49cc21165605504b810cd30f2e1e7ff3 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 18:15:12 2019 +0000 Update translations for abouttor-homepage_completed --- nl/aboutTor.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 9f60afbf2..1c4eb6dd9 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -6,25 +6,25 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.viewChangelog.label "Bekijk wijzigingslogboek"> +<!ENTITY aboutTor.viewChangelog.label "Wijzigingslogboek bekijken"> <!ENTITY aboutTor.ready.label "Onderzoek. Privé."> -<!ENTITY aboutTor.ready2.label "Je bent klaar voor de meest private browsing ervaring van de wereld"> +<!ENTITY aboutTor.ready2.label "U bent klaar voor de meest private surfervaring ter wereld."> <!ENTITY aboutTor.failure.label "Er ging iets mis!"> <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser."> -<!ENTITY aboutTor.search.label "Zoek met DuckDuckGo"> +<!ENTITY aboutTor.search.label "Zoeken met DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Bekijk onze Tor Browser Handleiding"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Bekijk onze Tor Browser-handleiding »">  -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Gebruikshandleiding"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> <!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3) goede-doelen organisatie die de Rechten en Vrijheden van de Mens bevordert door vrije open source anonimiteit en privacy technology te maken en toe te passen, hun ongerestricteerde beschikbaarheid en gebruik te ondersteunen, en hun wetenschappelijke en populaire begrip te bevorderen."> -<!ENTITY aboutTor.getInvolved.label "Doe Mee"> +<!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Krijg het laatste Tor nieuws regelrecht in jouw inbox."> -<!ENTITY aboutTor.newsletter.link_text "Meld je aan voor Tor Nieuws."> +<!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste Tor-nieuws direct in uw postvak."> +<!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 08 Apr '19

08 Apr '19

commit f0956bf205abe4ad29df51e64bf49dae9cbedb0f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 8 18:15:05 2019 +0000 Update translations for abouttor-homepage --- nl/aboutTor.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd index 9f60afbf2..1c4eb6dd9 100644 --- a/nl/aboutTor.dtd +++ b/nl/aboutTor.dtd @@ -6,25 +6,25 @@ <!ENTITY aboutTor.title "Over Tor"> -<!ENTITY aboutTor.viewChangelog.label "Bekijk wijzigingslogboek"> +<!ENTITY aboutTor.viewChangelog.label "Wijzigingslogboek bekijken"> <!ENTITY aboutTor.ready.label "Onderzoek. Privé."> -<!ENTITY aboutTor.ready2.label "Je bent klaar voor de meest private browsing ervaring van de wereld"> +<!ENTITY aboutTor.ready2.label "U bent klaar voor de meest private surfervaring ter wereld."> <!ENTITY aboutTor.failure.label "Er ging iets mis!"> <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser."> -<!ENTITY aboutTor.search.label "Zoek met DuckDuckGo"> +<!ENTITY aboutTor.search.label "Zoeken met DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Bekijk onze Tor Browser Handleiding"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Bekijk onze Tor Browser-handleiding »">  -<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Gebruikshandleiding"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "h"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-handleiding"> <!ENTITY aboutTor.tor_mission.label "Het Tor Project is een US 501(c)(3) goede-doelen organisatie die de Rechten en Vrijheden van de Mens bevordert door vrije open source anonimiteit en privacy technology te maken en toe te passen, hun ongerestricteerde beschikbaarheid en gebruik te ondersteunen, en hun wetenschappelijke en populaire begrip te bevorderen."> -<!ENTITY aboutTor.getInvolved.label "Doe Mee"> +<!ENTITY aboutTor.getInvolved.label "Meedoen »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.newsletter.tagline "Krijg het laatste Tor nieuws regelrecht in jouw inbox."> -<!ENTITY aboutTor.newsletter.link_text "Meld je aan voor Tor Nieuws."> +<!ENTITY aboutTor.newsletter.tagline "Ontvang het laatste Tor-nieuws direct in uw postvak."> +<!ENTITY aboutTor.newsletter.link_text "Meld u aan voor Tor News.">

1 0

[check/master] Update check.pot after 513656e
by arlo＠torproject.org 08 Apr '19

08 Apr '19

commit c7203e3d5466da2a4c7b868cf2ccdb7e1ca4d43b Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Apr 8 13:47:09 2019 -0400 Update check.pot after 513656e --- check.pot | 21 ++++++--------------- public/index.html | 2 +- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/check.pot b/check.pot index 79398e1..4c175b5 100644 --- a/check.pot +++ b/check.pot @@ -26,8 +26,8 @@ msgid "There is a security update available for Tor Browser." msgstr "" msgid "" -"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " -"here to go to the download page</a>" +"<a href=\"https://www.torproject.org/download/\">Click here to go to the " +"download page</a>" msgstr "" msgid "Sorry. You are not using Tor." @@ -36,24 +36,15 @@ msgstr "" msgid "" "If you are attempting to use a Tor client, please refer to the <a href=" "\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=" -"\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " -"configuring your Tor client</a>." +"\"https://support.torproject.org/#faq\">frequently asked questions</a>." msgstr "" msgid "Sorry, your query failed or an unexpected response was received." msgstr "" -msgid "" -"A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" - msgid "Your IP address appears to be: " msgstr "" -msgid "Are you using Tor?" -msgstr "" - msgid "This page is also available in the following languages:" msgstr "" @@ -71,9 +62,6 @@ msgstr "" msgid "Go" msgstr "" -msgid "Short User Manual" -msgstr "" - msgid "Donate to Support Tor" msgstr "" @@ -97,3 +85,6 @@ msgstr "" msgid "Stay Anonymous" msgstr "" + +msgid "Relay Search" +msgstr "" diff --git a/public/index.html b/public/index.html index 84f7c81..9b5d885 100644 --- a/public/index.html +++ b/public/index.html @@ -102,7 +102,7 @@ {{ end }} <p class="mid"> {{ if .IsTor }} - {{ GetText .Lang "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." | UnEscaped }} {{ GetText .Lang "For more information about this exit relay, see:" }} <a href="https://metrics.torproject.org/rs.html#search/{{ .IP }}">Relay Search</a>. + {{ GetText .Lang "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." | UnEscaped }} {{ GetText .Lang "For more information about this exit relay, see:" }} <a href="https://metrics.torproject.org/rs.html#search/{{ .IP }}">{{ GetText .Lang "Relay Search" }}</a>. {{ else }} {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://support.torproject.org/#faq\">frequently asked questions</a>." | UnEscaped }} {{ end }}

1 0

[check/master] Updates URLs for new Tor Project website
by arlo＠torproject.org 08 Apr '19

08 Apr '19

commit 513656ea359765191a1757a8fd7a776868c4a935 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Apr 2 14:08:02 2019 +0100 Updates URLs for new Tor Project website Fixes: #29983 --- public/base.html | 4 ++-- public/index.html | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/public/base.html b/public/base.html index 2f9facc..902ede2 100644 --- a/public/base.html +++ b/public/base.html @@ -50,8 +50,8 @@ {{ template "body" . }} </div> <div class="foot"> - <p class="project">{{ GetText .Lang "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy." }} <a href="https://www.torproject.org/about/overview.html.en">{{ GetText .Lang "Learn More »" | UnEscaped }}</a></p> + <p class="project">{{ GetText .Lang "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy." }} <a href="https://www.torproject.org/about/history/">{{ GetText .Lang "Learn More »" | UnEscaped }}</a></p> {{ template "foot" . }} </div> </body> -</html> \ No newline at end of file +</html> diff --git a/public/index.html b/public/index.html index 73a79b5..84f7c81 100644 --- a/public/index.html +++ b/public/index.html @@ -89,13 +89,13 @@ {{ if .NotUpToDate }} <p class="security"> {{ GetText .Lang "There is a security update available for Tor Browser." }}<br /> - {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }} + {{ GetText .Lang "<a href=\"https://www.torproject.org/download/\">Click here to go to the download page</a>" | UnEscaped }} </p> {{ else }} {{ if .NotTBB }} <p class="security"> {{ GetText .Lang "However, it does not appear to be Tor Browser." }}<br /> - {{ GetText .Lang "<a href=\"https://www.torproject.org/download/download-easy.html\">Click here to go to the download page</a>" | UnEscaped }} + {{ GetText .Lang "<a href=\"https://www.torproject.org/download/\">Click here to go to the download page</a>" | UnEscaped }} </p> {{ end }} {{ end }} @@ -104,14 +104,11 @@ {{ if .IsTor }} {{ GetText .Lang "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> for further information about using Tor safely. You are now free to browse the Internet anonymously." | UnEscaped }} {{ GetText .Lang "For more information about this exit relay, see:" }} <a href="https://metrics.torproject.org/rs.html#search/{{ .IP }}">Relay Search</a>. {{ else }} - {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for configuring your Tor client</a>." | UnEscaped }} + {{ GetText .Lang "If you are attempting to use a Tor client, please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a href=\"https://support.torproject.org/#faq\">frequently asked questions</a>." | UnEscaped }} {{ end }} </p> - <a id="donate" href="https://www.torproject.org/donate/donate.html">{{ GetText .Lang "Donate to Support Tor" }}</a> + <a id="donate" href="https://donate.torproject.org/">{{ GetText .Lang "Donate to Support Tor" }}</a> <ul id="links"> -  <li> <a href="https://tor.stackexchange.com/">{{ GetText .Lang "Tor Q&A Site" }}</a> </li> @@ -131,7 +128,7 @@ <script> // javascript enabled? var a = document.createElement("a"); - a.href = "https://www.torproject.org/docs/faq#TBBJavaScriptEnabled"; + a.href = "https://support.torproject.org/#tbb-34"; var c = document.createTextNode("{{ GetText .Lang "JavaScript is enabled." }}"); a.appendChild(c); document.getElementById("js").appendChild(a);

1 0