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

[tor-messenger-build/master] Add some more instantbird patches
by arlo＠torproject.org 24 Oct '14

24 Oct '14

commit d07428bfdc0179806550e6c5a3d253e7abfc7db2 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Oct 24 11:47:20 2014 -0700 Add some more instantbird patches * https://bugzilla.mozilla.org/show_bug.cgi?id=1088772 * Running tests w/o having built purplexpcom. --- projects/instantbird/config | 2 ++ projects/instantbird/null.patch | 36 +++++++++++++++++++++++++++++++ projects/instantbird/purple-tests.patch | 21 ++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index 8e09efb..c655d63 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -40,6 +40,8 @@ input_files: - filename: accountcreation.patch - filename: prepare-messages-for-displaying.patch - filename: Send-raw-msgs-through-the-conversation-service.patch + - filename: null.patch + - filename: purple-tests.patch - filename: mozconfig - name: python project: python diff --git a/projects/instantbird/null.patch b/projects/instantbird/null.patch new file mode 100644 index 0000000..868f440 --- /dev/null +++ b/projects/instantbird/null.patch @@ -0,0 +1,36 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1414169680 25200 +# Fri Oct 24 09:54:40 2014 -0700 +# Node ID 358de61ab92e106fe0ffd877aa71371ceae0b87f +# Parent 7e72c5322e5c082b2472e0b07a06627e222f3864 +Prevent empty messages from falling back to the original + + * Irc will split up messages and empty lines fall back to the encrypted + message in OTR. + +diff --git a/chat/components/src/imConversations.js b/chat/components/src/imConversations.js +--- a/chat/components/src/imConversations.js ++++ b/chat/components/src/imConversations.js +@@ -29,17 +29,20 @@ function imMessage(aPrplMessage) { + } + imMessage.prototype = { + __proto__: ClassInfo(["imIMessage", "prplIMessage"], "IM Message"), + cancelled: false, + color: "", + _displayMessage: null, + + get displayMessage() { +- return this._displayMessage || this.prplMessage.originalMessage; ++ // Explicitly test for null so that blank messages don't fall back to ++ // the original. Especially problematic in encryption extensions like OTR. ++ return this._displayMessage !== null ? ++ this._displayMessage : this.prplMessage.originalMessage; + }, + set displayMessage(aMsg) { this._displayMessage = aMsg; }, + + get message() this.prplMessage.message, + set message(aMsg) { this.prplMessage.message = aMsg; }, + + // from prplIMessage + get who() this.prplMessage.who, diff --git a/projects/instantbird/purple-tests.patch b/projects/instantbird/purple-tests.patch new file mode 100644 index 0000000..a0f7671 --- /dev/null +++ b/projects/instantbird/purple-tests.patch @@ -0,0 +1,21 @@ +# HG changeset patch +# User Arlo Breault <arlolra(a)gmail.com> +# Date 1414176284 25200 +# Fri Oct 24 11:44:44 2014 -0700 +# Node ID 77ce49687f31b9634c2c32f76777a17d85e23b72 +# Parent 358de61ab92e106fe0ffd877aa71371ceae0b87f +Remove purple testing + +diff --git a/im/test/xpcshell.ini b/im/test/xpcshell.ini +--- a/im/test/xpcshell.ini ++++ b/im/test/xpcshell.ini +@@ -1,9 +1,8 @@ + ; This Source Code Form is subject to the terms of the Mozilla Public + ; License, v. 2.0. If a copy of the MPL was not distributed with this + ; file, You can obtain one at http://mozilla.org/MPL/2.0/. + + [include:chat/modules/test/xpcshell.ini] + [include:chat/components/src/test/xpcshell.ini] + [include:chat/protocols/irc/test/xpcshell.ini] + [include:chat/protocols/yahoo/test/xpcshell.ini] +-[include:extensions/purple/purplexpcom/src/test/xpcshell.ini]

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit a79ffecf76b1792719a4c459e69661768f43a23b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 17:45:32 2014 +0000 Update translations for tor-launcher-properties --- lo/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lo/torlauncher.properties b/lo/torlauncher.properties index 098e511..a849dfe 100644 --- a/lo/torlauncher.properties +++ b/lo/torlauncher.properties @@ -3,7 +3,7 @@ torlauncher.error_title=ໂຕເປີດ Tor -torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. +torlauncher.tor_exited=ອອກຈາກ Tor ໂດຍບໍ່ຄາດຄິດ. ນີ້ອາດເປັນຍ້ອນຂໍ້ຜິດພາດໃນໂຕ ຂອງ Tor ເອງ, ຈາກໂປຣແກຣມອື່ນໃນລະບົບຂອງທ່ານ ຫຼື ຂໍ້ຜິດພາດຈາກໂຕເຄື່ອງເອງ. Tor ຈະບໍ່ສາມາດເຂົ້າເຖິງ ເວັບໄຊຕ໌ ໃດໆໄດ້ ຈົນກວ່າ ທ່ານຈະແລ່ນ Tor ຄືນໃໝ່. ຖ້າຫາກວ່າ ບັນຫາຍັງເປັນຄືເກົ່າ, ກະລຸນາ ສົ່ງສຳເນົາບັນທຶກ Tor ຂອງ ທ່ານ ໄປຍັງ ໜ່ວຍງານສະໜັບສະໜູນໄດ້. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start.

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit 204ee4fcf5656182e6e858613886aeb0a0fa0418 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 17:15:53 2014 +0000 Update translations for tor-launcher-properties --- lo/torlauncher.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lo/torlauncher.properties b/lo/torlauncher.properties index 3640155..098e511 100644 --- a/lo/torlauncher.properties +++ b/lo/torlauncher.properties @@ -1,7 +1,7 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=ໂຕເປີດ Tor torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit 7923d679341fc87e40570a51e643a00d29087655 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 17:15:19 2014 +0000 Update translations for torcheck_completed --- lo/torcheck.po | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/lo/torcheck.po b/lo/torcheck.po new file mode 100644 index 0000000..9d60c2a --- /dev/null +++ b/lo/torcheck.po @@ -0,0 +1,97 @@ +# TorCheck gettext template +# Copyright (C) 2008-2013 The Tor Project, Inc +# +# Translators: +# Sisouvan Sangbouaboulom <sisouvan(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2014-10-24 17:12+0000\n" +"Last-Translator: Sisouvan Sangbouaboulom <sisouvan(a)gmail.com>\n" +"Language-Team: Lao (http://www.transifex.com/projects/p/torproject/language/lo/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: lo\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Congratulations. This browser is configured to use Tor." +msgstr "ຊົມເຊີຍ. ຕົວຊອກຄົ້ນເວັບນີ້ ຕັ້ງຄ່າໃຫ້ໃຊ້ ຕໍຣ໌ ແລ້ວ." + +msgid "" +"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." +msgstr "ກະລຸນາ ອ້າງອິງຫາ <a href=\"https://www.torproject.org/\"> ເວັບໄຊຕ໌ ຕໍຣ໌ </a> ເພື່ອຮູ້ຂໍ້ມູນຂ່າວສານເພີ່ມ ກ່ຽວກັບ ການໃຊ້ງານ ຕໍຣ໌ ຢ່າງປອດໄພ. ບັດນີ້ ທ່ານສາມາດ ທ່ອງເວັບ ໃນນາມ ນິຣະນາມ ບຸກຄົນ ໄດ້ ໂດຍບໍ່ເສັຍຄ່າບໍລິການ." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "ມີຊຸດຄວາມປອດໄພ ກຽມພ້ອມໃຫ້ແລ້ວ ສຳລັບຊຸດທ່ອງເວັບ ຕໍຣ໌." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "ກົດໃສ່ບ່ອນນີ້ <a href=\"https://www.torproject.org/download/download-easy.html\"> ເພື່ອໄປຫາ ໜ້າ ດາວໂຫຼດ </a>" + +msgid "Sorry. You are not using Tor." +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>." +msgstr "ຖ້າທ່ານພະຍາຍາມຢາກໃຊ້ງານ ລູກຂ່າຍ ຕໍຣ໌, ກະລຸນາ ອ້າງອິງເຖິງ <a href=\"https://www.torproject.org/\"> ເວັບໄຊຕ໌ ຕໍຣ໌</a> ແລະ ໂດຍສະເພາະໃຫ້ເຂົ້າຫາ <a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> ເພື່ອເອົາຂໍ້ແນະນໍາ ສຳລັບການຕັ້ງຄ່າ ລະບົບລູກຂ່າຍ ຕໍຣ໌ </a>." + +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 "ການຍຸດການບໍລິການຊົ່ວຄາວປ້ອງກັນເຮົາຈາກການກຳນົດຄ່າທີ່ຢູ່ IP ເປັນ\n <a href=\"https://www.torproject.org/\">Tor</a> node." + +msgid "Your IP address appears to be: " +msgstr "ທີ່ຢູ່ IP ທີ່ປາກົດ ແມ່ນ:" + +msgid "Are you using Tor?" +msgstr "ທ່ານໄດ້ໃຊ້ ຕໍຣ໌ ບໍ່?" + +msgid "This page is also available in the following languages:" +msgstr "ໜ້ານີ້ ມີ ເປັນພາສາ ດັ່ງນີ້ ຄືກັນ:" + +msgid "For more information about this exit relay, see:" +msgstr "ສຳລັບຂໍ້ມູນຂ່າວສານເພີ່ມກ່ຽວກັບ ການຖ່າຍທອດນີ້, ໃຫ້ເຂົ້າເບິ່ງ:" + +msgid "" +"The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " +"development, and education of online anonymity and privacy." +msgstr "ໂຄງຫານ Tor ເປັນໂຄງການຂອງ US 501 (c) (3) ບໍ່ສະແຫວງຜົນກຳໄລ ທີ່ອຸທິດຕົນເຂົ້າໃນການວິໄຈ, ພັດທະນາ ແລະ ການສຶກສາ ຂອງຜູ່ທີ່ ອັອນລາຍນ໌ ທີ່ບໍປະສົງອອກຊື່ ແລະ ເປັນສ່ວນໂຕ." + +msgid "Learn More »" +msgstr "ຮຽນຮູ້ຕື່ມ &raquo" + +msgid "Go" +msgstr "ໄປ" + +msgid "Short User Manual" +msgstr "ຄູ່ມືສັ້ນສຳລັບຜູ່ໃຊ້ງານ" + +msgid "Donate to Support Tor" +msgstr "ບໍລິຈາກເພື່ອສະໜັບສະໜູນ Tor" + +msgid "Tor Q&A Site" +msgstr "ແຫຼ່ງ ຄຳຖາມ & ຄຳຕອບ ຂອງ Tor" + +msgid "Volunteer" +msgstr "ອາສາສະໝັກ" + +msgid "JavaScript is enabled." +msgstr "JavaScript ເປີດໃຊ້ງານຢູ່." + +msgid "JavaScript is disabled." +msgstr "JavaScript ຖືກປີດການໃຊ້ງານ" + +msgid "However, it does not appear to be the Tor Browser Bundle." +msgstr "ຢ່າງໃດກໍຕາມ, ມັນເບິ່ງຄືວ່າ ບໍ່ແມ່ນ ຊຸດທ່ອງເວັບ Tor."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit bd2faaf5b3733b2a60be273b78436b4e4fa9cf2c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 17:15:15 2014 +0000 Update translations for torcheck --- lo/torcheck.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lo/torcheck.po b/lo/torcheck.po index 2ae3d67..9d60c2a 100644 --- a/lo/torcheck.po +++ b/lo/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-24 16:40+0000\n" +"PO-Revision-Date: 2014-10-24 17:12+0000\n" "Last-Translator: Sisouvan Sangbouaboulom <sisouvan(a)gmail.com>\n" "Language-Team: Lao (http://www.transifex.com/projects/p/torproject/language/lo/)\n" "MIME-Version: 1.0\n" @@ -70,28 +70,28 @@ msgid "" msgstr "ໂຄງຫານ Tor ເປັນໂຄງການຂອງ US 501 (c) (3) ບໍ່ສະແຫວງຜົນກຳໄລ ທີ່ອຸທິດຕົນເຂົ້າໃນການວິໄຈ, ພັດທະນາ ແລະ ການສຶກສາ ຂອງຜູ່ທີ່ ອັອນລາຍນ໌ ທີ່ບໍປະສົງອອກຊື່ ແລະ ເປັນສ່ວນໂຕ." msgid "Learn More »" -msgstr "" +msgstr "ຮຽນຮູ້ຕື່ມ &raquo" msgid "Go" -msgstr "" +msgstr "ໄປ" msgid "Short User Manual" -msgstr "" +msgstr "ຄູ່ມືສັ້ນສຳລັບຜູ່ໃຊ້ງານ" msgid "Donate to Support Tor" -msgstr "" +msgstr "ບໍລິຈາກເພື່ອສະໜັບສະໜູນ Tor" msgid "Tor Q&A Site" -msgstr "" +msgstr "ແຫຼ່ງ ຄຳຖາມ & ຄຳຕອບ ຂອງ Tor" msgid "Volunteer" -msgstr "" +msgstr "ອາສາສະໝັກ" msgid "JavaScript is enabled." -msgstr "" +msgstr "JavaScript ເປີດໃຊ້ງານຢູ່." msgid "JavaScript is disabled." -msgstr "" +msgstr "JavaScript ຖືກປີດການໃຊ້ງານ" msgid "However, it does not appear to be the Tor Browser Bundle." -msgstr "" +msgstr "ຢ່າງໃດກໍຕາມ, ມັນເບິ່ງຄືວ່າ ບໍ່ແມ່ນ ຊຸດທ່ອງເວັບ Tor."

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit b8ef502f09ac564ee8fa95dcf09488363c73503e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 16:46:05 2014 +0000 Update translations for abouttor-homepage --- lo/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lo/aboutTor.dtd b/lo/aboutTor.dtd index 7128bb8..2c6a367 100644 --- a/lo/aboutTor.dtd +++ b/lo/aboutTor.dtd @@ -43,6 +43,6 @@ <!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> +<!ENTITY aboutTor.footer.label "ໂຄງຫານ Tor ເປັນໂຄງການຂອງ US 501 (c) (3) ບໍ່ສະແຫວງຜົນກຳໄລ ທີ່ອຸທິດຕົນເຂົ້າໃນການວິໄຈ, ພັດທະນາ ແລະ ການສຶກສາ ຂອງຜູ່ທີ່ ອັອນລາຍນ໌ ທີ່ບໍປະສົງອອກຊື່ ແລະ ເປັນສ່ວນໂຕ."> <!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 24 Oct '14

24 Oct '14

commit 056723c1179fa9b08d07eb890187d2513c5fc7a4 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 24 16:45:14 2014 +0000 Update translations for torcheck --- lo/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lo/torcheck.po b/lo/torcheck.po index 47f889f..2ae3d67 100644 --- a/lo/torcheck.po +++ b/lo/torcheck.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-10-17 16:11+0000\n" +"PO-Revision-Date: 2014-10-24 16:40+0000\n" "Last-Translator: Sisouvan Sangbouaboulom <sisouvan(a)gmail.com>\n" "Language-Team: Lao (http://www.transifex.com/projects/p/torproject/language/lo/)\n" "MIME-Version: 1.0\n" @@ -50,7 +50,7 @@ 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 "" +msgstr "ການຍຸດການບໍລິການຊົ່ວຄາວປ້ອງກັນເຮົາຈາກການກຳນົດຄ່າທີ່ຢູ່ IP ເປັນ\n <a href=\"https://www.torproject.org/\">Tor</a> node." msgid "Your IP address appears to be: " msgstr "ທີ່ຢູ່ IP ທີ່ປາກົດ ແມ່ນ:" @@ -67,7 +67,7 @@ msgstr "ສຳລັບຂໍ້ມູນຂ່າວສານເພີ່ມກ msgid "" "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, " "development, and education of online anonymity and privacy." -msgstr "" +msgstr "ໂຄງຫານ Tor ເປັນໂຄງການຂອງ US 501 (c) (3) ບໍ່ສະແຫວງຜົນກຳໄລ ທີ່ອຸທິດຕົນເຂົ້າໃນການວິໄຈ, ພັດທະນາ ແລະ ການສຶກສາ ຂອງຜູ່ທີ່ ອັອນລາຍນ໌ ທີ່ບໍປະສົງອອກຊື່ ແລະ ເປັນສ່ວນໂຕ." msgid "Learn More »" msgstr ""

1 0

[weather/master] Fix type in trademark FAQ URL. Fixes #11229
by kaner＠torproject.org 24 Oct '14

24 Oct '14

commit 4d3c28e0a52c75f212df96a4be64eb87f1298563 Author: Christian Fromme <kaner(a)strace.org> Date: Fri Oct 24 17:58:34 2014 +0200 Fix type in trademark FAQ URL. Fixes #11229 --- weather/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weather/templates/base.html b/weather/templates/base.html index 022af25..f5592f4 100644 --- a/weather/templates/base.html +++ b/weather/templates/base.html @@ -33,7 +33,7 @@ - "Tor" and the "Onion Logo" are <a target=_BLANK href="https://www.torproject.org/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc. + "Tor" and the "Onion Logo" are <a target=_BLANK href="https://www.torproject.org/docs/trademark-faq.html.en">registered trademarks</a> of The Tor Project, Inc.

1 0

[weather/master] Use "fingerprint" instead if "id" in Weather emails. Fixes: #3297
by kaner＠torproject.org 24 Oct '14

24 Oct '14

commit 4190d98ce764de786391055a2473086c82af96a9 Author: Christian Fromme <kaner(a)strace.org> Date: Fri Oct 24 18:15:13 2014 +0200 Use "fingerprint" instead if "id" in Weather emails. Fixes: #3297 --- weather/weatherapp/emails.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weather/weatherapp/emails.py b/weather/weatherapp/emails.py index 6028e59..76a841d 100644 --- a/weather/weatherapp/emails.py +++ b/weather/weatherapp/emails.py @@ -157,9 +157,9 @@ def _get_router_name(fingerprint, name): spaced_fingerprint = insert_fingerprint_spaces(fingerprint) if name == 'Unnamed': - return "(id: %s)" % spaced_fingerprint + return "(fingerprint: %s)" % spaced_fingerprint else: - return "%s (id: %s)" % (name, spaced_fingerprint) + return "%s (fingerprint: %s)" % (name, spaced_fingerprint) def _add_generic_footer(msg, unsubs_auth, pref_auth): """

1 0

[weather/master] Change remaining http:// links pointing to .torproject.org to https://
by kaner＠torproject.org 24 Oct '14

24 Oct '14

commit cae1ce60111ca1b4ed4b6d6863883463447a23fe Author: Christian Fromme <kaner(a)strace.org> Date: Fri Oct 24 17:45:22 2014 +0200 Change remaining http:// links pointing to .torproject.org to https:// Fixes: #12469 --- doc/design.txt | 2 +- weather/config/auth_token | 1 + weather/media/style.css | 2 +- weather/templates/subscribe.html | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/design.txt b/doc/design.txt index 368181c..b9814ae 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -201,5 +201,5 @@ Updating the database and sending email notifications is handled by the updaters Each Subscription in the database is updated, and emails are sent to the Subscriber's email if the conditions indicate a notification should be sent. .. _Django (v1.2): http://docs.djangoproject.com/en/1.2/intro/overview/ -.. _Tor T-Shirt page: http://www.torproject.org/tshirt.html.en +.. _Tor T-Shirt page: https://www.torproject.org/tshirt.html.en .. _directory specifications: https://svn.torproject.org/svn/tor/trunk/doc/spec/dir-spec.txt diff --git a/weather/config/auth_token b/weather/config/auth_token index e69de29..439691f 100644 --- a/weather/config/auth_token +++ b/weather/config/auth_token @@ -0,0 +1 @@ +clocEsp1Knye diff --git a/weather/log/debug b/weather/log/debug deleted file mode 100644 index e69de29..0000000 diff --git a/weather/media/style.css b/weather/media/style.css index 7af67ca..ca63e15 100644 --- a/weather/media/style.css +++ b/weather/media/style.css @@ -17,7 +17,7 @@ div#center { } div#banner { - background: url(http://weather.torproject.org/top-middle.png) repeat-x top left; + background: url(https://weather.torproject.org/top-middle.png) repeat-x top left; width: 100%; overflow: auto; } diff --git a/weather/templates/subscribe.html b/weather/templates/subscribe.html index 69837f6..0f61507 100644 --- a/weather/templates/subscribe.html +++ b/weather/templates/subscribe.html @@ -49,7 +49,7 @@ Tor Weather - Sign Up!  <a href="https://metrics.torproject.org/relay-search.html" target="_blank">(search for a router)</a> Hint: Often your node fingerprint can be found on unix-like machines in the file: <tt>/var/lib/tor/fingerprint</tt> - Note that this service is not for <a href="http://www.torproject.org/docs/bridges" target="_blank">Bridge </a> relays. + Note that this service is not for <a href="https://www.torproject.org/docs/bridges" target="_blank">Bridge </a> relays. {% for error in form.fingerprint.errors %} {{ error|safe}}

1 0