August 2013 - tor-commits - lists.torproject.org

[torbirdy/master] Bump minimum supported version to Thunderbird 10.0
by sukhbir＠torproject.org 28 Aug '13

28 Aug '13

commit 9298d23bd482ee6a2e2b3bd90765937e1e428745 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Aug 28 17:39:18 2013 -0400 Bump minimum supported version to Thunderbird 10.0 We no longer support Thunderbird 3.0; the minimum version that is supported now is 10.0 up to 23.0, so we no longer need to take care of backward compatibility. For more information, see ticket #9569. --- components/torbirdy.js | 49 ++++++------------------------------------------ install.rdf | 2 +- 2 files changed, 7 insertions(+), 44 deletions(-) diff --git a/components/torbirdy.js b/components/torbirdy.js index 1bb487f..c1da834 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -1,4 +1,5 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); +Components.utils.import("resource://gre/modules/AddonManager.jsm"); const Ci = Components.interfaces; const Cc = Components.classes; @@ -308,33 +309,12 @@ function TorBirdy() { this.acctMgr = Cc["@mozilla.org/messenger/account-manager;1"] .getService(Ci.nsIMsgAccountManager); - var observerService = Cc["@mozilla.org/observer-service;1"] - .getService(Ci.nsIObserverService); - observerService.addObserver(this, "quit-application-granted", false); - - var appInfo = Cc["@mozilla.org/xre/app-info;1"] - .getService(Ci.nsIXULAppInfo); - var versionChecker = Cc["@mozilla.org/xpcom/version-comparator;1"] - .getService(Ci.nsIVersionComparator); - var pluginsHost = Cc["@mozilla.org/plugin/host;1"].getService(Ci.nsIPluginHost); this.plugins = pluginsHost.getPluginTags({}); - if (versionChecker.compare(appInfo.version, "5.0") >= 0) { - this.is_tb5 = true; - } - else { - this.is_tb5 = false; - } - - if (this.is_tb5) { - Components.utils.import("resource://gre/modules/AddonManager.jsm"); - this.onEnabling = this.onOperationCancelled; - this.onDisabling = this.onUninstalling; - AddonManager.addAddonListener(this); - } else { - observerService.addObserver(this, "em-action-requested", false); - } + this.onEnabling = this.onOperationCancelled; + this.onDisabling = this.onUninstalling; + AddonManager.addAddonListener(this); this.setAccountPrefs(); this.setPrefs(); @@ -371,21 +351,7 @@ TorBirdy.prototype = { }, observe: function(subject, topic, data) { - if (topic == "em-action-requested") { - subject.QueryInterface(Ci.nsIUpdateItem); - - if (subject.id == TB_ID) { - if (data == "item-uninstalled" || data == "item-disabled") { - dump("Nooo! TorBirdy uninstall requested\n"); - this._uninstall = true; - this.resetUserPrefs(); - } else if (data == "item-cancel-action") { - dump("Uninstall requested cancelled. Yayay!\n"); - this._uninstall = false; - this.setPrefs(); - } - } - } + return; }, resetUserPrefs: function() { @@ -559,7 +525,4 @@ TorBirdy.prototype = { } -if (XPCOMUtils.generateNSGetFactory) - var NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]); -else - var NSGetModule = XPCOMUtils.generateNSGetModule([TorBirdy]); +const NSGetFactory = XPCOMUtils.generateNSGetFactory([TorBirdy]); diff --git a/install.rdf b/install.rdf index 8a65eb2..150458f 100644 --- a/install.rdf +++ b/install.rdf @@ -12,7 +12,7 @@  <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> - <em:minVersion>3.0</em:minVersion> + <em:minVersion>10.0</em:minVersion> <em:maxVersion>23.*</em:maxVersion> </Description> </em:targetApplication>

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit e9ce5b07cbaad001dd66b49c0b3f7c04e7368bbc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 19:16:56 2013 +0000 Update translations for tor-launcher-network-settings --- id/network-settings.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index 9cd4d28..b9c8cf6 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -11,8 +11,8 @@ <!ENTITY torSettings.configurePrompt1 ""> <!ENTITY torSettings.configurePrompt2 "Saya perlu menyesuaikan pengaturan network."> <!ENTITY torSettings.configure "Konfigur"> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.connectPrompt1 "Koneksi Internet komputer ini telah bebas dari halangan."> +<!ENTITY torSettings.connectPrompt2 "Saya ingin menghubungkan secara langsung ke jaringan Tor."> <!ENTITY torSettings.connect "Hubungi"> <!ENTITY torSettings.proxyQuestion "Apakah komputer ini perlu menggunakan proxy untuk mengakses internet?"> @@ -40,15 +40,15 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port"> <!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> <!ENTITY torsettings.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor"> <!ENTITY torsettings.useBridges.label "Masukkan satu atau lebih estafet jembatan diformulir address:port."> <!ENTITY torsettings.useBridges.placeholder "address:port"> <!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle ""> -<!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay"> +<!ENTITY torsettings.bridgeHelp1 "Jika kamu tidak dapat terhubung ke jaringan Tor, itu mungkin dikarenakan Penyedia Layanan Internet (ISP) anda atau agen lainnya memblokir Tor.&#160; Biasanya, kamu dapat memecahkan masalah ini dengan menggunakan Tor Bridges dimana merupakan relay tersembunyi yang lebih sulit untuk diblokir."> <!ENTITY torsettings.bridgeHelp2 "Untuk mengumpulkan bridge relays, gunakan web browser untuk mengunjungi halaman ini: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 "">

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit 2c01813d593d521a0936607385a9657fb8e16900 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 19:16:30 2013 +0000 Update translations for https_everywhere_completed --- id/https-everywhere.dtd | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index 35381cd..1da792f 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -34,4 +34,9 @@ <!ENTITY https-everywhere.source.filename "nama file"> <!ENTITY https-everywhere.source.unable_to_download "Tidak dapat mengunduh sumber"> - +<!ENTITY https-everywhere.popup.title "Pemberitahuan pengembangan.11 HTTPS Everywhere 4.0"> +<!ENTITY https-everywhere.popup.paragraph1 "Oops. Kamu menggunakan HTTPS Everywhere versi stabil, tapi kami mungkin saja secara tidak sengaja memperbaharuinya ke versi pengembangan di rilis terakhir kami."> +<!ENTITY https-everywhere.popup.paragraph2 "Apakah kamu ingin balik ke stabil?"> +<!ENTITY https-everywhere.popup.paragraph3 "Kami menyukainya jika kamu tetep terus menggunakan rilis pengembangan kami dan membantu kami membuat HTTPS Everywhere lebih baik! Kamu mungkin menemukan beberapa kutu lagi disini dan disana, dimana kamu dapat melaporkannya ke https-everywhere(a)eff.org. Maaf atas ketidaknyamanannya, dan terima kasih telah menggunakan HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.keep "Tetapkan saya di versi pengembangan"> +<!ENTITY https-everywhere.popup.revert "Unduh versi stabil terakhir">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit 22edb454034ed1881b01c13f902a1c60723628d5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 19:16:25 2013 +0000 Update translations for https_everywhere --- id/https-everywhere.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id/https-everywhere.dtd b/id/https-everywhere.dtd index e34e604..1da792f 100644 --- a/id/https-everywhere.dtd +++ b/id/https-everywhere.dtd @@ -34,9 +34,9 @@ <!ENTITY https-everywhere.source.filename "nama file"> <!ENTITY https-everywhere.source.unable_to_download "Tidak dapat mengunduh sumber"> -<!ENTITY https-everywhere.popup.title ""> -<!ENTITY https-everywhere.popup.paragraph1 ""> -<!ENTITY https-everywhere.popup.paragraph2 ""> -<!ENTITY https-everywhere.popup.paragraph3 ""> -<!ENTITY https-everywhere.popup.keep ""> -<!ENTITY https-everywhere.popup.revert ""> +<!ENTITY https-everywhere.popup.title "Pemberitahuan pengembangan.11 HTTPS Everywhere 4.0"> +<!ENTITY https-everywhere.popup.paragraph1 "Oops. Kamu menggunakan HTTPS Everywhere versi stabil, tapi kami mungkin saja secara tidak sengaja memperbaharuinya ke versi pengembangan di rilis terakhir kami."> +<!ENTITY https-everywhere.popup.paragraph2 "Apakah kamu ingin balik ke stabil?"> +<!ENTITY https-everywhere.popup.paragraph3 "Kami menyukainya jika kamu tetep terus menggunakan rilis pengembangan kami dan membantu kami membuat HTTPS Everywhere lebih baik! Kamu mungkin menemukan beberapa kutu lagi disini dan disana, dimana kamu dapat melaporkannya ke https-everywhere(a)eff.org. Maaf atas ketidaknyamanannya, dan terima kasih telah menggunakan HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.keep "Tetapkan saya di versi pengembangan"> +<!ENTITY https-everywhere.popup.revert "Unduh versi stabil terakhir">

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit c99b53f805c9da199f3ba1610afc6ea658302045 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 19:16:15 2013 +0000 Update translations for whisperback --- id/id.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/id/id.po b/id/id.po index d3dc997..4238022 100644 --- a/id/id.po +++ b/id/id.po @@ -4,13 +4,14 @@ # # Translators: # berespost <berespost(a)gmail.com>, 2013 +# Mohamad Hasan Al Banna, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-08-15 01:50+0000\n" -"Last-Translator: berespost <berespost(a)gmail.com>\n" +"PO-Revision-Date: 2013-08-28 19:11+0000\n" +"Last-Translator: Mohamad Hasan Al Banna\n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,12 +23,12 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "" +msgstr "Kontak surel salah: %s" #: ../whisperBack/whisperback.py:80 #, python-format msgid "Invalid contact OpenPGP key: %s" -msgstr "" +msgstr "Kunci kontak OpenPGP salah: %s" #: ../whisperBack/whisperback.py:82 msgid "Invalid contact OpenPGP public key block" @@ -80,7 +81,7 @@ msgid "" "The bug report could not be sent, likely due to network problems. Please try to reconnect to the network and click send again.\n" "\n" "If it does not work, you will be offered to save the bug report." -msgstr "" +msgstr "\n\nPelaporan kutu tidak dapat terkirim, sepertinya karena masalah jaringan. Harap coba menghubungkan kembali ke jaringan dan klik kirim lagi.\n\nJika tidak bisa juga, kalu akan ditawari untuk menyimpan laporan kutu." #: ../whisperBack/gui.py:274 msgid "Your message has been sent." @@ -93,7 +94,7 @@ msgstr "Terjadi eror saat enkripsi." #: ../whisperBack/gui.py:301 #, python-format msgid "Unable to save %s." -msgstr "" +msgstr "Tidak dapat menyimpan %s." #. XXX: fix string #: ../whisperBack/gui.py:325 @@ -108,7 +109,7 @@ msgstr "" #: ../whisperBack/gui.py:389 ../data/whisperback.ui.h:21 msgid "WhisperBack" -msgstr "" +msgstr "WhisperBack" #: ../whisperBack/gui.py:390 ../data/whisperback.ui.h:2 msgid "Send feedback in an encrypted mail."

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit b3104d98fa325e77f6aa22d9d8cb1c0a8101b48a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 18:15:09 2013 +0000 Update translations for gettor --- zh_TW/gettor.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/zh_TW/gettor.po b/zh_TW/gettor.po index 8b17f87..06eac52 100644 --- a/zh_TW/gettor.po +++ b/zh_TW/gettor.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-08-28 17:43+0000\n" +"PO-Revision-Date: 2013-08-28 18:11+0000\n" "Last-Translator: chinrur <chinrur(a)gmail.com>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -146,7 +146,7 @@ msgid "" " \n" " windows\n" " split" -msgstr "" +msgstr "十分簡單包括一個關鍵字於新命令列中自行'分割'(這部分\n很重要！)，像這樣：\n\n視窗\n分割" #: lib/gettor/i18n.py:107 msgid "" @@ -169,7 +169,7 @@ msgid "" "2.) Unzip all files ending in \".z\". If you saved all attachments to\n" "a fresh folder before, simply unzip all files in that folder. If you don't\n" "know how to unzip the .z files, please see the UNPACKING THE FILES section." -msgstr "" +msgstr "2.) 將帶有“.Z”結尾的所有檔案解壓縮，若您儲存所有附加檔案於\n一個新的資料夾，然後只需解壓縮該資料夾中的所有檔案，若您不知道\n如何解壓縮.Z檔案，請參閱檔案解壓縮章節。" #: lib/gettor/i18n.py:119 msgid "" @@ -182,7 +182,7 @@ msgid "" "4.) Now unpack the multi-volume archive into one file by double-\n" "clicking the file ending in \"..split.part01.exe\". This should start the \n" "process automatically." -msgstr "" +msgstr "4.) 現在多卷檔案解壓縮到一個檔案中通過點兩下\n滑鼠左鍵於檔案結束於“..split.part01.exe”，接著將啟動\n自動處理。" #: lib/gettor/i18n.py:126 msgid "" @@ -199,13 +199,13 @@ msgstr "6.) 就是這樣，您就大功告成了。感謝您使用Tor和祝您 msgid "" "SUPPORT\n" "=======" -msgstr "" +msgstr "支援\n====" #: lib/gettor/i18n.py:138 msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "" +msgstr "這是您所請求的軟體為一zip檔案，請解壓逤並取得\n套件及驗證簽數。" #: lib/gettor/i18n.py:141 msgid "" @@ -215,14 +215,14 @@ msgid "" "tool as follows after unpacking the zip file:\n" "\n" " gpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" -msgstr "" +msgstr "驗證簽署\n=======\n若您的電腦已安裝GnuPG，使用gpg命令列 \n工具於解壓縮zip檔後：\n\ngpg --verify tor-browser-1.3.24_en-US.exe.asc tor-browser-1.3.24_en-US.exe" #: lib/gettor/i18n.py:148 msgid "" "The output should look somewhat like this:\n" "\n" " gpg: Good signature from 'Erinn Clark <...>'" -msgstr "" +msgstr "輸出應該看起來有點像是這樣：\n\ngpg: Good signature from 'Erinn Clark <...>'" #: lib/gettor/i18n.py:152 msgid "" @@ -230,7 +230,7 @@ msgid "" "a graphical user interface for GnuPG on this website:\n" "\n" " http://www.gnupg.org/related_software/frontends.html" -msgstr "" +msgstr "若您不熟悉命令提示字元工具，嘗試尋找\n一個圖形化用戶界面，於GnuPG這個網站上：\n\nhttp://www.gnupg.org/related_…" #: lib/gettor/i18n.py:157 msgid ""

1 0

r26330: {website} clarify this is as of 2011. (website/trunk/about/en)
by Andrew Lewman 28 Aug '13

28 Aug '13

Author: phobos Date: 2013-08-28 17:58:30 +0000 (Wed, 28 Aug 2013) New Revision: 26330 Modified: website/trunk/about/en/sponsors.wml Log: clarify this is as of 2011. Modified: website/trunk/about/en/sponsors.wml =================================================================== --- website/trunk/about/en/sponsors.wml 2013-08-28 01:38:30 UTC (rev 26329) +++ website/trunk/about/en/sponsors.wml 2013-08-28 17:58:30 UTC (rev 26330) @@ -14,7 +14,7 @@ <p> The Tor Project's <a href="<page about/torusers>">diversity of users</a> means we have a diversity of funding sources too — and we're eager to diversify - even further! Our sponsorships are divided into levels based on total funding received: + even further! Our sponsorships are divided into levels based on total funding received (as of 2011): </p> <h3><i>Magnoliophyta</i> (over $1 million)</h3>

1 0

[stem/master] Adding tor directory authority information
by atagar＠torproject.org 28 Aug '13

28 Aug '13

commit 303b4dfdac10ecb6c348dafbb08f27cae9799347 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 27 22:37:56 2013 -0700 Adding tor directory authority information To work our remote descriptor fetching module needed the addresses and dirports of voting authorities. However, on reflection it's useful if we reflect the rest of the authority information from tor's config.c as well. For instance, the v3ident is handy if our users want to query authority key certificates. --- stem/descriptor/remote.py | 167 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 148 insertions(+), 19 deletions(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 2f721f6..ad7a953 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -42,6 +42,8 @@ itself... :: + DirectoryAuthority - Information about a tor directory authority. + Query - Asynchronous request to download tor descriptors |- start - issues the query if it isn't already running +- run - blocks until the request is finished and provides the results @@ -67,7 +69,8 @@ itself... .. data:: DIRECTORY_AUTHORITIES - Mapping of directory authority nicknames to their (address, dirport) tuple. + Mapping of nicknames to the associated + :class:`~stem.descriptor.remote.DirectoryAuthority`. """ import io @@ -89,22 +92,10 @@ from stem.util import log MAX_FINGERPRINTS = 96 MAX_MICRODESCRIPTOR_HASHES = 92 -# Tor directory authorities as of commit f631b73 (7/4/13). This should only -# include authorities with 'v3ident': -# -# https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816 +# We commonly only want authorities that vote in the consensus, and hence have +# a v3ident. -DIRECTORY_AUTHORITIES = { - 'moria1': ('128.31.0.39', 9131), - 'tor26': ('86.59.21.38', 80), - 'dizum': ('194.109.206.212', 80), - 'turtles': ('76.73.17.194', 9030), - 'gabelmoo': ('212.112.245.170', 80), - 'dannenberg': ('193.23.244.244', 80), - 'urras': ('208.83.223.34', 443), - 'maatuska': ('171.25.193.9', 443), - 'Faravahar': ('154.35.32.5', 80), -} +HAS_V3IDENT = lambda auth: auth.v3ident is not None def _guess_descriptor_type(resource): @@ -350,7 +341,8 @@ class Query(object): """ if use_authority or not self.endpoints: - address, dirport = random.choice(DIRECTORY_AUTHORITIES.values()) + authority = random.choice(filter(HAS_V3IDENT, DIRECTORY_AUTHORITIES.values())) + address, dirport = authority.address, authority.dir_port else: address, dirport = random.choice(self.endpoints) @@ -398,7 +390,9 @@ class DescriptorDownloader(object): def __init__(self, use_mirrors = False, **default_args): self._default_args = default_args - self._endpoints = DIRECTORY_AUTHORITIES.values() + + authorities = filter(HAS_V3IDENT, DIRECTORY_AUTHORITIES.values()) + self._endpoints = [(auth.address, auth.dir_port) for auth in authorities] if use_mirrors: try: @@ -419,7 +413,8 @@ class DescriptorDownloader(object): :raises: **Exception** if unable to determine the directory mirrors """ - new_endpoints = set(DIRECTORY_AUTHORITIES.values()) + authorities = filter(HAS_V3IDENT, DIRECTORY_AUTHORITIES.values()) + new_endpoints = set([(auth.address, auth.dir_port) for auth in authorities]) consensus = list(self.get_consensus(document_handler = stem.descriptor.DocumentHandler.DOCUMENT).run())[0] @@ -602,3 +597,137 @@ class DescriptorDownloader(object): resource, **args ) + + +class DirectoryAuthority(object): + """ + Tor directory authority, a special type of relay `hardcoded into tor + <https://gitweb.torproject.org/tor.git/blob/f631b73:/src/or/config.c#l816>`_ + that enumerates the other relays within the network. + + At a very high level tor works as follows... + + 1. A volunteer starts up a new tor relay, during which it sends a `server + descriptor <server_descriptor.html>`_ to each of the directory + authorities. + + 2. Each hour the directory authorities make a `vote <networkstatus.html>`_ + that says who they think the active relays are in the network and some + attributes about them. + + 3. The directory authorities send each other their votes, and compile that + into the `consensus <networkstatus.html>`_. This document is very similar + to the votes, the only difference being that the majority of the + authorities agree upon and sign this document. The idividual relay entries + in the vote or consensus is called `router status entries + <router_status_entry.html>`_. + + 4. Tor clients (people using the service) download the consensus from one of + the authorities or a mirror to determine the active relays within the + network. They in turn use this to construct their circuits and use the + network. + + The directory information hardcoded in tor occasionally changes, and as such + the information this provides might not necessarily match your version of tor. + This is the tor directory information as of **commit 00bcc25 (8/27/13)**. + + :var str nickname: nickname of the authority + :var str address: IP address of the authority, presently they're all IPv4 but + this may not always be the case + :var int or_port: port on which the relay services relay traffic + :var int dir_port: port on which directory information is available + :var str fingerprint: relay fingerprint + :var str v3ident: identity key fingerprint used to sign votes and consensus + """ + + def __init__(self, nickname = None, address = None, or_port = None, dir_port = None, fingerprint = None, v3ident = None): + self.nickname = nickname + self.address = address + self.or_port = or_port + self.dir_port = dir_port + self.fingerprint = fingerprint + self.v3ident = v3ident + + +DIRECTORY_AUTHORITIES = { + 'moria1': DirectoryAuthority( + nickname = 'moria1', + address = '128.31.0.39', + or_port = 9101, + dir_port = 9131, + fingerprint = '9695DFC35FFEB861329B9F1AB04C46397020CE31', + v3ident = 'D586D18309DED4CD6D57C18FDB97EFA96D330566', + ), + 'tor26': DirectoryAuthority( + nickname = 'tor26', + address = '86.59.21.38', + or_port = 443, + dir_port = 80, + fingerprint = '847B1F850344D7876491A54892F904934E4EB85D', + v3ident = '14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4', + ), + 'dizum': DirectoryAuthority( + nickname = 'dizum', + address = '194.109.206.212', + or_port = 443, + dir_port = 80, + fingerprint = '7EA6EAD6FD83083C538F44038BBFA077587DD755', + v3ident = 'E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58', + ), + 'Tonga': DirectoryAuthority( + nickname = 'Tonga', + address = '82.94.251.203', + or_port = 443, + dir_port = 80, + fingerprint = '4A0CCD2DDC7995083D73F5D667100C8A5831F16D', + v3ident = None, # does not vote in the consensus + ), + 'turtles': DirectoryAuthority( + nickname = 'turtles', + address = '76.73.17.194', + or_port = 9090, + dir_port = 9030, + fingerprint = 'F397038ADC51336135E7B80BD99CA3844360292B', + v3ident = '27B6B5996C426270A5C95488AA5BCEB6BCC86956', + ), + 'gabelmoo': DirectoryAuthority( + nickname = 'gabelmoo', + address = '212.112.245.170', + or_port = 443, + dir_port = 80, + fingerprint = 'F2044413DAC2E02E3D6BCF4735A19BCA1DE97281', + v3ident = 'ED03BB616EB2F60BEC80151114BB25CEF515B226', + ), + 'dannenberg': DirectoryAuthority( + nickname = 'dannenberg', + address = '193.23.244.244', + or_port = 443, + dir_port = 80, + fingerprint = '7BE683E65D48141321C5ED92F075C55364AC7123', + v3ident = '585769C78764D58426B8B52B6651A5A71137189A', + ), + 'urras': DirectoryAuthority( + nickname = 'urras', + address = '208.83.223.34', + or_port = 80, + dir_port = 443, + fingerprint = '0AD3FA884D18F89EEA2D89C019379E0E7FD94417', + v3ident = '80550987E1D626E3EBA5E5E75A458DE0626D088C', + ), + 'maatuska': DirectoryAuthority( + nickname = 'maatuska', + address = '171.25.193.9', + or_port = 80, + dir_port = 443, + fingerprint = 'BD6A829255CB08E66FBE7D3748363586E46B3810', + v3ident = '49015F787433103580E3B66A1707A00E60F2D15B', + ), + 'Faravahar': DirectoryAuthority( + nickname = 'Faravahar', + address = '154.35.32.5', + or_port = 443, + dir_port = 80, + fingerprint = 'CF6D0AAFB385BE71B8E111FC5CFF4B47923733BC', + v3ident = 'EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97', + ), +}

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit 7e8ec96a399c540eb1bb587764a29ff6657d8485 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 17:46:41 2013 +0000 Update translations for torbirdy_completed --- zh_TW/torbirdy.dtd | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd new file mode 100644 index 0000000..ba1217d --- /dev/null +++ b/zh_TW/torbirdy.dtd @@ -0,0 +1,63 @@ +<!ENTITY torbirdy.accountprefs.title "帳戶組態"> +<!ENTITY torbirdy.accountprefs.startup.label "啟動時自動檢查更新訊息"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "每次自動檢查更新訊息"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "分"> +<!ENTITY torbirdy.accountprefs.cancel.button "取消"> +<!ENTITY torbirdy.accountprefs.save.button "儲存"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy 偏好設定"> +<!ENTITY torbirdy.prefs.save.button "儲存"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "取消"> +<!ENTITY torbirdy.prefs.extra1.button "回復預設值"> +<!ENTITY torbirdy.prefs.extra1.key "d"> +<!ENTITY torbirdy.prefs.extra2.button "測試伺服器設定"> +<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "代理伺服器(proxy)設定"> +<!ENTITY torbirdy.prefs.privacy.label "隱私權設定"> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 設定"> +<!ENTITY torbirdy.prefs.security.label "安全設定"> +<!ENTITY torbirdy.prefs.recommended.text "在TorBirdy (Tor)中使用建議的代理伺服器設定"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "請選擇一個匿名服務"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "使用自訂的代理伺服器設定"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS 主機："> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "連接埠："> +<!ENTITY torbirdy.prefs.socks_port.key "P"> +<!ENTITY torbirdy.prefs.torification.label "透明化 Torification(警告：需要自訂轉接伺服器transproxy 或是 Tor 路由器)"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "全球"> +<!ENTITY torbirdy.prefs.imap.label "啟用郵件發送支援IMAP帳戶[預設值：停用]"> +<!ENTITY torbirdy.prefs.imap.key "P"> +<!ENTITY torbirdy.prefs.startup_folder.label "啟動時選擇上次最後存取的郵件資料夾[預設值：停用並選擇本地資料夾]"> +<!ENTITY torbirdy.prefs.startup_folder.key "I"> +<!ENTITY torbirdy.prefs.timezone.label "不要設定Thunderbird的時區為UTC[預設值：設定為UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "將收件人私鑰ID訊息加密[預設值：無加密]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.confirmemail.label "確認在發送電子郵件之前啟用Enigmail[預設值：不確認]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "啟用Thunderbird的自動電子郵件組態精靈[預設值：停用]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "自動檢查所有帳戶更新訊息[預設值：停用]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.renegotiation.label "允許連接到不具備支援 SSL / TLS 安全辨識的服務器[預設值：不允許]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> +<!ENTITY torbirdy.prefs.account_specific "專一性帳戶"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "請選擇一個帳戶："> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "密鑰伺服器(s)可供使用："> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "使用Tor Onion 路由器"> +<!ENTITY torbirdy.panel.usejondo.label "使用 JonDo (進階)"> +<!ENTITY torbirdy.panel.usewhonix.label "使用 Whonix"> +<!ENTITY torbirdy.panel.preferences.label "開啟 TorBirdy 偏好設定"> + +<!ENTITY torbirdy.firstrun.title "TorBirdy 初次啟動">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 28 Aug '13

28 Aug '13

commit 15bd5f17e5723cb4137513cc651c87739bcaf4a9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 28 17:46:37 2013 +0000 Update translations for torbirdy --- zh_TW/torbirdy.dtd | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/zh_TW/torbirdy.dtd b/zh_TW/torbirdy.dtd index 0e7d940..ba1217d 100644 --- a/zh_TW/torbirdy.dtd +++ b/zh_TW/torbirdy.dtd @@ -14,11 +14,11 @@ <!ENTITY torbirdy.prefs.cancel.button "取消"> <!ENTITY torbirdy.prefs.extra1.button "回復預設值"> <!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button ""> -<!ENTITY torbirdy.prefs.extra2.key "P"> +<!ENTITY torbirdy.prefs.extra2.button "測試伺服器設定"> +<!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "代理伺服器(proxy)設定"> <!ENTITY torbirdy.prefs.privacy.label "隱私權設定"> -<!ENTITY torbirdy.prefs.enigmail.label ""> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail 設定"> <!ENTITY torbirdy.prefs.security.label "安全設定"> <!ENTITY torbirdy.prefs.recommended.text "在TorBirdy (Tor)中使用建議的代理伺服器設定"> <!ENTITY torbirdy.prefs.recommended.key "r"> @@ -30,34 +30,34 @@ <!ENTITY torbirdy.prefs.socks_host.key "h"> <!ENTITY torbirdy.prefs.socks_port.label "連接埠："> <!ENTITY torbirdy.prefs.socks_port.key "P"> -<!ENTITY torbirdy.prefs.torification.label ""> +<!ENTITY torbirdy.prefs.torification.label "透明化 Torification(警告：需要自訂轉接伺服器transproxy 或是 Tor 路由器)"> <!ENTITY torbirdy.prefs.torification.key "t"> <!ENTITY torbirdy.prefs.global "全球"> <!ENTITY torbirdy.prefs.imap.label "啟用郵件發送支援IMAP帳戶[預設值：停用]"> <!ENTITY torbirdy.prefs.imap.key "P"> -<!ENTITY torbirdy.prefs.startup_folder.label ""> +<!ENTITY torbirdy.prefs.startup_folder.label "啟動時選擇上次最後存取的郵件資料夾[預設值：停用並選擇本地資料夾]"> <!ENTITY torbirdy.prefs.startup_folder.key "I"> <!ENTITY torbirdy.prefs.timezone.label "不要設定Thunderbird的時區為UTC[預設值：設定為UTC]"> <!ENTITY torbirdy.prefs.timezone.key "z"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "將收件人私鑰ID訊息加密[預設值：無加密]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> -<!ENTITY torbirdy.prefs.confirmemail.label ""> +<!ENTITY torbirdy.prefs.confirmemail.label "確認在發送電子郵件之前啟用Enigmail[預設值：不確認]"> <!ENTITY torbirdy.prefs.confirmemail.key "c"> -<!ENTITY torbirdy.prefs.emailwizard.label ""> -<!ENTITY torbirdy.prefs.emailwizard.key ""> -<!ENTITY torbirdy.prefs.automatic.label ""> -<!ENTITY torbirdy.prefs.automatic.key ""> -<!ENTITY torbirdy.prefs.renegotiation.label ""> +<!ENTITY torbirdy.prefs.emailwizard.label "啟用Thunderbird的自動電子郵件組態精靈[預設值：停用]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.automatic.label "自動檢查所有帳戶更新訊息[預設值：停用]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.renegotiation.label "允許連接到不具備支援 SSL / TLS 安全辨識的服務器[預設值：不允許]"> <!ENTITY torbirdy.prefs.renegotiation.key "r"> <!ENTITY torbirdy.prefs.account_specific "專一性帳戶"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "請選擇一個帳戶："> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label ""> -<!ENTITY torbirdy.prefs.enigmail.keyserver.key ""> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "密鑰伺服器(s)可供使用："> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "使用Tor Onion 路由器"> <!ENTITY torbirdy.panel.usejondo.label "使用 JonDo (進階)"> <!ENTITY torbirdy.panel.usewhonix.label "使用 Whonix"> <!ENTITY torbirdy.panel.preferences.label "開啟 TorBirdy 偏好設定"> -<!ENTITY torbirdy.firstrun.title ""> +<!ENTITY torbirdy.firstrun.title "TorBirdy 初次啟動">

1 0