January 2012 - tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit ab5fd53cf19008f48275ea117f73cf634722aa3e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 21:15:04 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 8da9ea8..93537b4 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -195,6 +195,6 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="unable_to_read_hidden_service_name">Kan hidden service naam niet lezen.</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> - <string name="pref_use_sys_iptables_summary"></string> + <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van degene gekoppeld aan Orbot</string> <string name="error_installing_binares"></string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit ca8f438ef43be110ece192c9f9109bf3e3a5ffc1 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 20:45:04 2012 +0000 Update translations for orbot --- values-nl/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 8b10f6b..8da9ea8 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -187,14 +187,14 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="openssl_version"></string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Een app wil hidden service poort %S openen naar het Tor netwerk. Dit is veilig als je de app vertrouwd.</string> <string name="found_existing_tor_process">bestaand Tor proces gevonden...</string> <string name="something_bad_happened">Er is iets slechts gebeurt. Controleer de log</string> <string name="hidden_service_on">hidden service op:</string> <string name="unable_to_read_hidden_service_name">Kan hidden service naam niet lezen.</string> <string name="unable_to_start_tor">Kan Tor niet starten:</string> - <string name="pref_use_sys_iptables_title"></string> + <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string> <string name="pref_use_sys_iptables_summary"></string> <string name="error_installing_binares"></string> </resources>

1 0

[metrics-lib/master] Start parsing bridge pool assignments.
by karsten＠torproject.org 15 Jan '12

15 Jan '12

commit 0f0b0091a629945d07e365b194f58b6fd3c9fb84 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 15 11:17:51 2012 +0100 Start parsing bridge pool assignments. --- .../descriptor/BridgePoolAssignment.java | 17 +++ .../descriptor/BridgePoolAssignmentReader.java | 7 ++ .../descriptor/DescriptorSourceFactory.java | 6 + .../descriptor/impl/BridgePoolAssignmentImpl.java | 107 ++++++++++++++++++++ .../torproject/descriptor/impl/DescriptorImpl.java | 9 +- .../impl/RelayOrBridgeDescriptorReaderImpl.java | 4 +- 6 files changed, 146 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/descriptor/BridgePoolAssignment.java b/src/org/torproject/descriptor/BridgePoolAssignment.java new file mode 100644 index 0000000..43857ac --- /dev/null +++ b/src/org/torproject/descriptor/BridgePoolAssignment.java @@ -0,0 +1,17 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor; + +import java.util.SortedMap; + +public interface BridgePoolAssignment extends Descriptor { + + /* Return the publication time of this bridge pool assignment list. */ + public long getPublishedMillis(); + + /* Return the entries contained in this bridge pool assignment list with + * map keys being bridge fingerprints and map values being assignment + * strings, e.g. "https ring=3 flag=stable". */ + public SortedMap<String, String> getEntries(); +} + diff --git a/src/org/torproject/descriptor/BridgePoolAssignmentReader.java b/src/org/torproject/descriptor/BridgePoolAssignmentReader.java index 9553fe4..e84f2b4 100644 --- a/src/org/torproject/descriptor/BridgePoolAssignmentReader.java +++ b/src/org/torproject/descriptor/BridgePoolAssignmentReader.java @@ -11,6 +11,13 @@ public interface BridgePoolAssignmentReader { /* Add a local directory to read bridge pool assignments from. */ public void addDirectory(File directory); + /* Exclude files that are contained in the given history file and that + * haven't changed since they were last read. Add reads from the + * current run to the history file. Remove files that don't exist + * anymore from the history file. Lines in the history file contain the + * last modified timestamp and the absolute path of a file. */ + public void setExcludeFiles(File historyFile); + /* Read the previously configured bridge pool assignments and make them * available via the returned blocking iterator. Whenever the reader * runs out of descriptors and expects to provide more shortly after, it diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java index 9dcba61..031eeab 100644 --- a/src/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java @@ -23,5 +23,11 @@ public class DescriptorSourceFactory { public static BridgeDescriptorReader createBridgeDescriptorReader() { return new RelayOrBridgeDescriptorReaderImpl(); } + + /* Create a bridge pool assignment reader. */ + public static BridgePoolAssignmentReader + createBridgePoolAssignmentReader() { + return new RelayOrBridgeDescriptorReaderImpl(); + } } diff --git a/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java new file mode 100644 index 0000000..b539dde --- /dev/null +++ b/src/org/torproject/descriptor/impl/BridgePoolAssignmentImpl.java @@ -0,0 +1,107 @@ +/* Copyright 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import org.torproject.descriptor.BridgePoolAssignment; + +/* TODO Write a test class. */ +public class BridgePoolAssignmentImpl extends DescriptorImpl + implements BridgePoolAssignment { + + protected static List<BridgePoolAssignment> parseDescriptors( + byte[] descriptorsBytes) { + List<BridgePoolAssignment> parsedDescriptors = + new ArrayList<BridgePoolAssignment>(); + List<byte[]> splitDescriptorsBytes = + DescriptorImpl.splitRawDescriptorBytes(descriptorsBytes, + "bridge-pool-assignment "); + try { + for (byte[] descriptorBytes : splitDescriptorsBytes) { + BridgePoolAssignment parsedDescriptor = + new BridgePoolAssignmentImpl(descriptorBytes); + parsedDescriptors.add(parsedDescriptor); + } + } catch (DescriptorParseException e) { + /* TODO Handle this error somehow. */ + System.err.println("Failed to parse descriptor. Skipping."); + e.printStackTrace(); + } + return parsedDescriptors; + } + + protected BridgePoolAssignmentImpl(byte[] descriptorBytes) + throws DescriptorParseException { + super(descriptorBytes); + this.parseDescriptorBytes(); + Set<String> exactlyOnceKeywords = new HashSet<String>(Arrays.asList( + new String[] { "bridge-pool-assignment" })); + this.checkExactlyOnceKeywords(exactlyOnceKeywords); + this.checkFirstKeyword("bridge-pool-assignment"); + return; + } + + private void parseDescriptorBytes() throws DescriptorParseException { + try { + BufferedReader br = new BufferedReader(new StringReader( + new String(this.rawDescriptorBytes))); + String line; + while ((line = br.readLine()) != null) { + if (line.startsWith("bridge-pool-assignment ")) { + this.parseBridgePoolAssignmentLine(line); + } else { + this.parseBridgeLine(line); + } + } + } catch (IOException e) { + throw new RuntimeException("Internal error: Ran into an " + + "IOException while parsing a String in memory. Something's " + + "really wrong.", e); + } + } + + private void parseBridgePoolAssignmentLine(String line) + throws DescriptorParseException { + String[] parts = line.split(" "); + if (parts.length != 3) { + throw new DescriptorParseException("Illegal line '" + line + + "' in bridge pool assignment."); + } + this.publishedMillis = ParseHelper.parseTimestampAtIndex(line, + parts, 1, 2); + } + + private void parseBridgeLine(String line) + throws DescriptorParseException { + String[] parts = line.split(" "); + if (parts.length < 2) { + throw new DescriptorParseException("Illegal line '" + line + + "' in bridge pool assignment."); + } + String fingerprint = ParseHelper.parseTwentyByteHexString(line, + parts[0]); + String poolAndDetails = line.substring(line.indexOf(" ") + 1); + this.entries.put(fingerprint, poolAndDetails); + } + + private long publishedMillis; + public long getPublishedMillis() { + return this.publishedMillis; + } + + private SortedMap<String, String> entries = + new TreeMap<String, String>(); + public SortedMap<String, String> getEntries() { + return new TreeMap<String, String>(this.entries); + } +} + diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 68b70e1..cc0cd6e 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -47,10 +47,13 @@ public abstract class DescriptorImpl implements Descriptor { firstLines.contains("\nextra-info ")) { parsedDescriptors.addAll(ExtraInfoDescriptorImpl. parseDescriptors(rawDescriptorBytes)); + } else if (firstLines.startsWith("bridge-pool-assignment ") || + firstLines.contains("\nbridge-pool-assignment ")) { + parsedDescriptors.addAll(BridgePoolAssignmentImpl. + parseDescriptors(rawDescriptorBytes)); } else { - throw new DescriptorParseException("Could not detect relay or " - + "bridge descriptor type in descriptor starting with '" - + firstLines + "'."); + throw new DescriptorParseException("Could not detect descriptor " + + "type in descriptor starting with '" + firstLines + "'."); } return parsedDescriptors; } diff --git a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java index 1e341f5..27a5a40 100644 --- a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java @@ -24,9 +24,11 @@ import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorFile; import org.torproject.descriptor.RelayDescriptorReader; import org.torproject.descriptor.BridgeDescriptorReader; +import org.torproject.descriptor.BridgePoolAssignmentReader; public class RelayOrBridgeDescriptorReaderImpl - implements RelayDescriptorReader, BridgeDescriptorReader { + implements RelayDescriptorReader, BridgeDescriptorReader, + BridgePoolAssignmentReader { private List<File> directories = new ArrayList<File>(); public void addDirectory(File directory) {

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit 660a1c1fc758c262964608f91ab4c9ac5181de71 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 09:45:04 2012 +0000 Update translations for tsum --- ms/tsum.po | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/ms/tsum.po b/ms/tsum.po index 9138e5c..39b43b3 100644 --- a/ms/tsum.po +++ b/ms/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-15 09:14+0000\n" +"PO-Revision-Date: 2012-01-15 09:39+0000\n" "Last-Translator: Hafiz Ismail <mhbinet(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,6 +31,10 @@ msgid "" "find the answer to your question in this document, email " "help(a)rt.torproject.org." msgstr "" +"Manual pengguna ini mengandungi maklumat mengnai bagaimana memuat turun Tor," +" bagaimana menggunakan dan apakah yang boleh dibuat sekiranya Tor tidak " +"dapat menyambungkan kepada rangkaian. Jika anda tidak dapat mencari jawapan," +" emailkan kepada help(a)rt.torproject.org." #. type: Plain text #: en/tsum.text:11 @@ -39,6 +43,9 @@ msgid "" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." msgstr "" +"Ambil perharian bahawa kami menyediakan bantuan dengan sukarela, dan kami " +"menerima banyak email setiap hari. Anda tidak perlu risau sekiranya kami " +"tidak dapat melayan anda dengan segera." #. type: Plain text #: en/tsum.text:13 @@ -95,6 +102,9 @@ msgid "" "to a website with a username and password, make sure that you are using " "HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." msgstr "" +"Sekiranya anda berhubung menggunakan maklumat sulit, contohnya log masuk ke " +"website yang ada username dan password, pastikan anda menggunakan HTTPS " +"(cth: **https**://torproject.org/, bukan **http**://torproject.org/)." #. type: Plain text #: en/tsum.text:38 @@ -128,6 +138,9 @@ msgid "" " browse to the [Tor Project website](https://www.torproject.org/) and " "download it there, or you can use GetTor, the email autoresponder." msgstr "" +"Ada terdapat dua cara untuk mendapat perisian Tor. Anda boleh mencari dalam " +"[Website Projek Tor](https://www.torproject.org/) dan download di sana, atau" +" boleh menggunakan GetTor, iaitu email autoresponder." #. type: Plain text #: en/tsum.text:53 @@ -135,6 +148,8 @@ msgid "" "### How to get Tor via email\n" "To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." msgstr "" +"### Bagaimana mendapatkan Tor menggunakan email\n" +"Untuk mendapatkan versi Tor Browser Bundle untuk Windows dalam Bahasa Inggeris, hantarkan email kepada gettor(a)torproject.org dengan **windows** pada isi kandungan mesej. Anda boleh membiarkan tajuk tidak diisi." #. type: Plain text #: en/tsum.text:57 @@ -166,6 +181,11 @@ msgid "" "want, send an email to help(a)rt.torproject.org and we\n" "will give you a list of website mirrors to use.\n" msgstr "" +"**Nota**: Browser Tor Bundle untuk Linux dan Mac OS X adalah mungkin\n" +"besar, dan anda tidak akan mendapat bundle ini dengan akaun email\n" +"Gmail, Hotmail atau Yahoo. Sekiranya anda tidak dapat menerima bundle\n" +"yang dikehendaki, hantarkan email kepada help(a)rt.torproject.org dan kami\n" +"akan memberikan senarai mirror website untuk digunakan.\n" #. type: Plain text #: en/tsum.text:73 @@ -173,6 +193,8 @@ msgid "" "#### How to get Tor as several small sized packages\n" "It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." msgstr "" +"#### Bagaimana mendapatkan Tor dalam paket kecil\n" +"Anda boleh meminta untuk mendapatkan Browser Bundle Tor untuk Windows dalam beberapa paket kecil berbanding satu fail besar. Ini sangat berguna sekiranya anda tidak mempunyai bandwidth yang besar, atau provider tidak membenarkan anda menerima attachment besar." #. type: Plain text #: en/tsum.text:76 @@ -200,6 +222,10 @@ msgid "" "*What to do with split packages* for information on how to unpack and re-" "assemble the small sized packages." msgstr "" +"Adalah penting untuk memasukkan keyword *split* dalam satu barisan. Lihat " +"*What to do with split packages* untuk maklumat tentang bagaimana untuk " +"mengetahui bagaimana untuk unpack dan menggabung semula paket yang " +"dikecilkan." #. type: Plain text #: en/tsum.text:89 @@ -207,6 +233,8 @@ msgid "" "### Tor for smartphones\n" "You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." msgstr "" +"### Tor untuk smartphone\n" +"Anda boleh mendapat Tor pada peralatan Android dengan menginsatall pakej dinamakan *Orbot*. Untuk maklumat lanjut mengenai bagaimana anda boleh muat turun dan install Orbot, sila rujuk [Website Projek Tor](https://www.torproject.org/docs/android.html.en)." #. type: Plain text #: en/tsum.text:93 @@ -215,6 +243,9 @@ msgid "" "Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " "iOS](http://sid77.slackware.it/iphone/)." msgstr "" +"Kami juga mempunyai pakej eksperimen untuk [Nokia " +"Maemo/N900](https://www.torproject.org/docs/N900.html.en) dan [Apple " +"iOS](http://sid77.slackware.it/iphone/)." #. type: Plain text #: en/tsum.text:97 @@ -222,6 +253,8 @@ msgid "" "### How to verify that you have the right version\n" "Before running the Tor Browser Bundle, you should make sure that you have the right version." msgstr "" +"### Bagaimana untuk menentukan anda ada versi yang betul\n" +"Sebelum menjalankan Browser Bundle Tor, anda patut mengesahkan anda mempunyai versi yang betul." #. type: Plain text #: en/tsum.text:102

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit 0aa52bae3166702b11dafc49373cb8144ce1cc90 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 09:15:09 2012 +0000 Update translations for tsum --- ms/tsum.po | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 4 deletions(-) diff --git a/ms/tsum.po b/ms/tsum.po index 58b5242..9138e5c 100644 --- a/ms/tsum.po +++ b/ms/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-15 08:44+0000\n" +"PO-Revision-Date: 2012-01-15 09:14+0000\n" "Last-Translator: Hafiz Ismail <mhbinet(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #. type: Plain text #: en/tsum.text:2 msgid "# The Short User Manual\n" -msgstr "" +msgstr "# Manual Pengguna Ringkas\n" #. type: Plain text #: en/tsum.text:7 @@ -180,6 +180,8 @@ msgid "" "Send an email to gettor(a)torproject.org with the following words in the body " "of the email:" msgstr "" +"Hantar email ke gettor(a)torproject.org dengan perkataan berikut pada isi " +"kandungan email:" #. type: Plain text #: en/tsum.text:79 @@ -188,6 +190,8 @@ msgid "" "windows \n" "split\n" msgstr "" +"windows \n" +"split\n" #. type: Plain text #: en/tsum.text:83 @@ -432,6 +436,10 @@ msgid "" "*Network*, and tick the box that says *My firewall only lets me connect\n" "to certain ports*. \n" msgstr "" +"**You are behind a restrictive firewall**: Untuk memberitahu Tor hanya mencuba port\n" +"80 dan port 443, buka kontrol panel Vidalia, klik pada *Settings* dan\n" +"*Network*, dan klik pada kotak bertanda *My firewall only lets me connect\n" +"to certain ports*. \n" #. type: Plain text #: en/tsum.text:187 @@ -441,6 +449,9 @@ msgid "" "anti-virus program is not preventing Tor from making network\n" "connections.\n" msgstr "" +"**Your anti-virus program is blocking Tor**: Pastikan bahawa anti-virus\n" +"anda tidak menghalang Tor daripada membuat sambungan\n" +"rangkaian.\n" #. type: Plain text #: en/tsum.text:191 @@ -449,6 +460,10 @@ msgid "" "(ISP) is blocking Tor. Very often this can be worked around with **Tor " "bridges**, hidden relays that aren't as easy to block." msgstr "" +"Sekiranya Tor masih tidak berjalan, berkemungkinan besar Internet Service " +"Provider (ISP) telah menghalang Tor. Sangat jarang hal ini boleh diatasi " +"menggunakan **Tor bridges**, iaitu relay tersembunyi yang bukan mudah untuk " +"disekat." #. type: Plain text #: en/tsum.text:195 @@ -472,6 +487,10 @@ msgid "" "guarantee that the bridge you are using now will work tomorrow, so you " "should make a habit of updating your list of bridges every so often." msgstr "" +"Konfigurasi lebih daripada satu bridge akan membuatkan sambungan Tor lebih " +"stabil, dalam kes di mana bridge tidak dapat dihubungi. Tidak ada jaminan " +"bahawa bridge digunakan hari ini dapat berjalan keesokan hari, jadi anda " +"boleh memastikan senarai bridge sentiasa dikemaskini dengan kerap." #. type: Plain text #: en/tsum.text:214 @@ -493,16 +512,18 @@ msgid "" "The steps below assume you have a functional Tor/Vidalia configuration, and " "you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." msgstr "" +"Langkah di bawah menganggap anda sudah ada konfigurasi Tor/Vidalia, dan anda" +" sudah menjumpai senarai HTTPS, SOCKS4, atau SOCKS5 proxy." #. type: Bullet: '1. ' #: en/tsum.text:235 msgid "Open the Vidalia control panel, click on *Settings*." -msgstr "" +msgstr "Buka kontrol panel Vidalia, klik pada *Settings*." #. type: Bullet: '2. ' #: en/tsum.text:235 msgid "Click *Network*. Select *I use a proxy to access the Internet*." -msgstr "" +msgstr "Klik *Network*. Pilih *I use a proxy to access the Internet*." #. type: Plain text #: en/tsum.text:235 @@ -518,6 +539,14 @@ msgid "" "7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" "proxy to access the rest of the Tor network.\n" msgstr "" +"3. Pada barisan *Address*, masukkan alamat open proxy. Ini boleh jadi \n" +"hostname atau nombor IP.\n" +"4. Masukkan port pada proxy.\n" +"5. Biasanya, anda tidak memerlukan username dan password. Sekiranya anda\n" +"perlu, masukkan maklumat pada ruangan diperlukan.\n" +"6. Pilih *Type* proxy yang digunakan samaada HTTP/HTTPS, SOCKS4,\n" +"atau SOCKS5.\n" +"7. Tekan butang *OK*. Vidalia dan Tor sekarang disetkan untuk menggunakan proxy untuk mengakses rangkaian Tor.\n" #. type: Plain text #: en/tsum.text:240 @@ -585,6 +614,9 @@ msgid "" "\".exe\" file in the same directory. Run this file and wait for the Tor " "Browser Bundle to start." msgstr "" +"Setelah proses ekstrak fail berjaya, anda boleh melihat fail \".exe\" yang " +"dibuat pada direktori yang sama. Jalankan fail ini dan tunggu Browser Tor " +"Bundle mula berjalan." #. type: Plain text #: en/tsum.text:281 @@ -603,6 +635,11 @@ msgid "" "case, you will need to close the old Vidalia and Tor before you can run\n" "this one.\n" msgstr "" +"**You are already running Vidalia and Tor**:\n" +"Contohnya, ini mungkin berlaku sekiranya anda memasang bundle Vidalia\n" +"dan anda mencuba jalankan Browser Tor Bundle. Dalam kes ini,\n" +"anda perlu tutup Vidalia lama dan Tor sebelum menjalankan yang\n" +"baru.\n" #. type: Plain text #: en/tsum.text:294 @@ -615,6 +652,12 @@ msgid "" "is unable to restart Tor for you; go into your process or task manager,\n" "and terminate the Tor process. Then use Vidalia to restart Tor.\n" msgstr "" +"**Vidalia crashed, but left Tor running**:\n" +"Jika dialog meminta anda memasukkan control password yang mempunyai butang\n" +"Reset, anda boleh klik butang tersebut dan Vidalia akan memulakan semula Tor\n" +"dengan password control rawak yang baru. Sekiranya anda tidak dapat melihat butang\n" +"Reset, atau Vidalia tidak dapat memulakan semula Tor; buka process atau task manager,\n" +"dan tamatkan proses Tor. Kemudian gunakan Vidalia untuk memulakan semula Tor.\n" #. type: Plain text #: en/tsum.text:298 @@ -623,6 +666,9 @@ msgid "" "[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " "Project website." msgstr "" +"Untuk maklumat lanjut, lihat " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) pada laman web " +"Tor Project." #. type: Plain text #: en/tsum.text:303 @@ -638,6 +684,10 @@ msgid "" " over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" " on the YouTube website before you can use the HTML5 player." msgstr "" +"Kebanyakan video YouTube dapat dijalankan dengan HTML5, dan anda boleh " +"melihat video menggunakan Tor. Anda perlu join [HTML5 " +"trial](https://www.youtube.com/html5) dalam website YouTube sebelum boleh " +"menggunakan player HTML5." #. type: Plain text #: en/tsum.text:312 @@ -646,6 +696,9 @@ msgid "" "close it, so you will need to re-join the trial the next time you run the " "Tor Browser Bundle." msgstr "" +"Catatan: browser tidak akan ingat bahawa anda sudah join trial setelah anda " +"tutup, jadi anda perlu join semula setiap kali menjalankan Browser Tor " +"Bundle." #. type: Plain text #: en/tsum.text:315 @@ -653,6 +706,8 @@ msgid "" "Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" "/torbutton-faq.html#noflash) for more information." msgstr "" +"Sila lihat [Torbutton FAQ](https://www.torproject.org/torbutton/torbutton-" +"faq.html#noflash) untuk maklumat lanjut." #. type: Plain text #: en/tsum.text:321

1 0

[metrics-lib/master] Only send end-of-stream object once.
by karsten＠torproject.org 15 Jan '12

15 Jan '12

commit 72f0a56a7b4608ae31f48dff9aa3007e16bbeaf0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 15 09:37:12 2012 +0100 Only send end-of-stream object once. --- .../impl/RelayOrBridgeDescriptorReaderImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java index 8e1c3bc..1e341f5 100644 --- a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java @@ -148,10 +148,9 @@ public class RelayOrBridgeDescriptorReaderImpl System.err.println("Error while reading descriptors in '" + directory.getAbsolutePath() + "'."); /* TODO Handle this exception somehow. */ - } finally { - this.descriptorQueue.setOutOfDescriptors(); } } + this.descriptorQueue.setOutOfDescriptors(); } private List<Descriptor> readFile(File file) throws IOException, DescriptorParseException {

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit a7d447b170471e2814f8e5d8d6c67f826a97153c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 08:45:06 2012 +0000 Update translations for tsum --- ms/tsum.po | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git a/ms/tsum.po b/ms/tsum.po index 4ca4a33..58b5242 100644 --- a/ms/tsum.po +++ b/ms/tsum.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2012-01-15 08:12+0000\n" +"PO-Revision-Date: 2012-01-15 08:44+0000\n" "Last-Translator: Hafiz Ismail <mhbinet(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -251,6 +251,9 @@ msgid "" "**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" "**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" msgstr "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Kebanyakan versi linux sudah ada GnuPG di dalamnya.\n" #. type: Plain text #: en/tsum.text:112 @@ -258,6 +261,8 @@ msgid "" "Please note that you may need to edit the paths and the commands used below " "to get it to work on your system." msgstr "" +"Ambil perhatian anda perlu mengubah maklumat path dan command used di bawah " +"untuk membolehkan ia berjalan dalam sistem anda." #. type: Plain text #: en/tsum.text:115 @@ -265,28 +270,30 @@ msgid "" "Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " "Erinn's key, run:" msgstr "" +"Tanda Erinn Clark untuk Browser Tor Bundles dengan kunci 0x63FEE659. Untuk " +"import kunci Erinn, jalankan:" #. type: Plain text #: en/tsum.text:117 #, no-wrap msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" -msgstr "" +msgstr "»gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" #. type: Plain text #: en/tsum.text:119 msgid "After importing the key, verify that the fingerprint is correct:" -msgstr "" +msgstr "Selepas memasukkan kunci, sahkan tandatangan adalah betul:" #. type: Plain text #: en/tsum.text:121 #, no-wrap msgid "\tgpg --fingerprint 0x63FEE659\n" -msgstr "" +msgstr "»gpg --fingerprint 0x63FEE659\n" #. type: Plain text #: en/tsum.text:123 msgid "You should see:" -msgstr "" +msgstr "Anda patut lihat:" #. type: Plain text #: en/tsum.text:130 @@ -299,6 +306,12 @@ msgid "" "\tuid Erinn Clark <erinn(a)double-helix.org>\n" "\tsub 2048R/EB399FD7 2003-10-16\n" msgstr "" +"»pub 2048R/63FEE659 2003-10-16\n" +"» Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"»uid Erinn Clark <erinn(a)torproject.org>\n" +"»uid Erinn Clark <erinn(a)debian.org>\n" +"»uid Erinn Clark <erinn(a)double-helix.org>\n" +"»sub 2048R/EB399FD7 2003-10-16\n" #. type: Plain text #: en/tsum.text:132 @@ -306,6 +319,8 @@ msgid "" "To verify the signature of the package you downloaded, run the following " "command:" msgstr "" +"Untuk mengesahkan tandatangan pakej yang sudah dimuat turun, jalankan arahan" +" berikut:" #. type: Plain text #: en/tsum.text:134 @@ -314,6 +329,8 @@ msgid "" "\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" "US.exe\n" msgstr "" +"»gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" #. type: Plain text #: en/tsum.text:140 @@ -334,6 +351,12 @@ msgid "" "want to make sure that the version number on the top line of the changelog " "file matches the version number in the filename." msgstr "" +"Setelah anda mengesahkan tandatangan dan melihat *\"Good signature\"*, " +"teruskan dengan mengekstrak pakej. Anda seterusnya boleh melihat direktori " +"seperti **tor-browser_en-US**. Di dalam direktori ada terdapat direktori " +"lain dipanggil **Docs**, yang mengandungi fail bernama **changelog**. Anda " +"perlu memastikan nombor versi pada barisan atas fail changelog adalah sama " +"dengan nombor pada nama fail." #. type: Plain text #: en/tsum.text:153 @@ -351,6 +374,12 @@ msgid "" "[https://check.torproject.org/](https://check.torproject.org/). You can now " "browse the Internet through Tor." msgstr "" +"Apabila anda memulakan Tor Browser Bundle, anda boleh melihat Vidalia " +"bermula dan menyambungkan anda kepada rangkaian Tor. Selepas itu, anda boleh" +" melihat browser yang menunjukkan anda menggunakan Tor. Proses selesai " +"setelah terpapar " +"[https://check.torproject.org/](https://check.torproject.org/). Anda " +"sekarang boleh menggunakan Internet melalui Tor." #. type: Plain text #: en/tsum.text:163 @@ -359,6 +388,8 @@ msgid "" "*Please note that it is important that you use the browser that comes\n" "with the bundle, and not your own browser.*\n" msgstr "" +"*Ambil perhatian adalah penting untuk anda menggunakan browser yang datang " +"bersama bundle, elakkan menggunakan browser anda.*\n" #. type: Plain text #: en/tsum.text:169 @@ -375,6 +406,10 @@ msgid "" "*Message Log* and select the *Advanced* tab. It may be that Tor won't " "connect because:" msgstr "" +"Sekiranya sambungan Internet berfungsi, tetapi Tor masih tidak boleh " +"menyambung kepada rangkaian, cuba langkah berikut; buka Vidalia control " +"panel, klik pada *Message Log* dan pilih *Advanced* tab. Adalah " +"berkemungkinan Tor tidak bersambung kerana:" #. type: Plain text #: en/tsum.text:178 @@ -384,6 +419,9 @@ msgid "" "system is correct, and restart Tor. You may need to synchronize your\n" "system clock with an Internet time server. \n" msgstr "" +"**Your system clock is off**: Pastikan tarikh dan masa dalam sistem\n" +"anda adalah betul, dan buka semula Tor. Anda mungkin perlu menyamakan \n" +"masa sistem dengan server masa internet. \n" #. type: Plain text #: en/tsum.text:183

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit 528b74986bb611e4d45bf98fcad9ec5c0cbdaca3 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 08:45:05 2012 +0000 Update translations for orbot --- values-zh/strings.xml | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 84c3b44..1ae662f 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -12,8 +12,8 @@ <string name="status_disabled">Orbot 已停用</string> <string name="status_shutting_down">Orbot 正在关闭</string> <string name="tor_process_starting"></string> - <string name="tor_process_complete"></string> - <string name="tor_process_waiting"></string> + <string name="tor_process_complete">完成。</string> + <string name="tor_process_waiting">等待。</string> <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string> <string name="menu_home">首页</string> <string name="menu_browse">浏览</string> @@ -86,15 +86,15 @@ <string name="pref_start_boot_title">开机启动Orbot</string> <string name="pref_start_boot_summary">当您的 Android 设备开机时自动启动 Orbot 并连接至 Tor 网络</string> <string name="wizard_title_msg"></string> - <string name="wizard_warning_title"></string> + <string name="wizard_warning_title">警告</string> <string name="wizard_warning_msg"></string> - <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_title">允许</string> <string name="wizard_permissions_root_msg1"></string> <string name="wizard_permissions_root_msg2"></string> <string name="wizard_permissions_no_root_msg"></string> <string name="wizard_tips_title"></string> <string name="wizard_tips_gibberbot"></string> - <string name="gibberbot_apk_url"></string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="wizard_transproxy_title"></string> @@ -135,7 +135,7 @@ <string name="bridge_error"></string> <string name="bridge_requires_ip"></string> <string name="send_email_for_bridges"></string> - <string name="error"></string> + <string name="error">错误</string> <string name="your_reachableaddresses_settings_caused_an_exception_"></string> <string name="your_relay_settings_caused_an_exception_"></string> <string name="exit_nodes"></string> @@ -174,7 +174,7 @@ <string name="project_home"></string> <string name="project_urls"></string> <string name="the_tor_license"></string> - <string name="https_torproject_org"></string> + <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software"></string> <string name="tor_version"></string> <string name="libevent_version"></string>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 15 Jan '12

15 Jan '12

commit 25a4d7e07e7e79809f0be3a8e440cee3eb1b1b26 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 08:15:04 2012 +0000 Update translations for tsum --- ms/tsum.po | 633 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 633 insertions(+), 0 deletions(-) diff --git a/ms/tsum.po b/ms/tsum.po new file mode 100644 index 0000000..4ca4a33 --- /dev/null +++ b/ms/tsum.po @@ -0,0 +1,633 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Hafiz Ismail <mhbinet(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-05 17:16+0000\n" +"PO-Revision-Date: 2012-01-15 08:12+0000\n" +"Last-Translator: Hafiz Ismail <mhbinet(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ms\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. type: Plain text +#: en/tsum.text:2 +msgid "# The Short User Manual\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:7 +msgid "" +"This user manual contains information about how to download Tor, how to use " +"it, and what to do if Tor is unable to connect to the network. If you can't " +"find the answer to your question in this document, email " +"help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:11 +msgid "" +"Please note that we are providing support on a voluntary basis, and we get a" +" lot of emails every single day. There is no need to worry if we don't get " +"back to you straight away." +msgstr "" + +#. type: Plain text +#: en/tsum.text:13 +#, no-wrap +msgid "" +"How Tor works\n" +"-------------\n" +msgstr "" +"Bagaimana Tor Berfungsi\n" +"-----------------------------\n" + +#. type: Plain text +#: en/tsum.text:19 +msgid "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as *relays*) in the Tor network, before the" +" traffic is sent out onto the public Internet." +msgstr "" +"Tor ialah rangkaian maya yang membolehkan anda menambahkan privasi dan " +"keselamatan semasa menggunakan internet. Tor akan menghantar trafik kepada " +"tiga server secara raway (*relays*) dalam rangkaian Tor, sebelum menghantar " +"trafik tersebut kepada talian Internet." + +#. type: Plain text +#: en/tsum.text:21 +msgid "![How Tor Works](images/how-tor-works.png)" +msgstr "![Bagaimana Tor Berfungsi](images/how-tor-works.png)" + +#. type: Plain text +#: en/tsum.text:26 +msgid "" +"The image above illustrates a user browsing to different websites over Tor. " +"The green monitors represent relays in the Tor network, while the three keys" +" represent the layers of encryption between the user and each relay." +msgstr "" + +#. type: Plain text +#: en/tsum.text:31 +msgid "" +"Tor will anonymize the origin of your traffic, and it will encrypt " +"everything between you and the Tor network. Tor will also encrypt your " +"traffic inside the Tor network, but it cannot encrypt your traffic between " +"the Tor network and its final destination." +msgstr "" +"Tor akan menukar trafik asal, mengkod/encrypt antara anda dan rangkaian Tor." +" Tor juga mengkod trafik di dalam rangkaian Tor, tetapi ia tidak mengkod " +"trafik antara rangkaian Tor dengan destinasi akhir." + +#. type: Plain text +#: en/tsum.text:36 +msgid "" +"If you are communicating sensitive information, for example when logging on " +"to a website with a username and password, make sure that you are using " +"HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:38 +#, no-wrap +msgid "" +"How to download Tor\n" +"-------------------\n" +msgstr "" +"Bagaimana ingin muat turun Tor\n" +"------------------------------------\n" + +#. type: Plain text +#: en/tsum.text:44 +msgid "" +"The bundle we recommend to most users is the [Tor Browser " +"Bundle](https://www.torproject.org/projects/torbrowser.html). This bundle " +"contains a browser preconfigured to safely browse the Internet through Tor, " +"and requires no installation. You download the bundle, extract the archive, " +"and start Tor." +msgstr "" +"Versi bundle yang dicadangkan kepada kebanyakan pengguna ialah [Tor Browser " +"Bundle](https://www.torproject.org/projects/torbrowser.html). Ia mengandungi" +" browser yang sudah disetkan kepada tahap keselamatan di Internet dan " +"melalui Tor, dan ia tidak memerlukan instalasi. Anda muat turun bundle, " +"extract dan terus boleh menggunakan Tor." + +#. type: Plain text +#: en/tsum.text:48 +msgid "" +"There are two different ways to get hold of the Tor software. You can either" +" browse to the [Tor Project website](https://www.torproject.org/) and " +"download it there, or you can use GetTor, the email autoresponder." +msgstr "" + +#. type: Plain text +#: en/tsum.text:53 +msgid "" +"### How to get Tor via email\n" +"To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." +msgstr "" + +#. type: Plain text +#: en/tsum.text:57 +msgid "" +"You can also request the Tor Browser Bundle for Mac OS X (write " +"**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " +"**linux-x86_64** for 64-bit systems)." +msgstr "" +"Anda juga boleh meminta Tor Browser Bundle untuk Mac OS X (write " +"**macos-i386**), dan Linux (write **linux-i386** untuk sistem 32-bit atau " +"**linux-x86_64** untuk sistem 64-bit)." + +#. type: Plain text +#: en/tsum.text:61 +msgid "" +"If you want a translated version of Tor, write **help** instead. You will " +"then receive an email with instructions and a list of available languages." +msgstr "" +"Jika anda mahu versi Tor yang sudah di alih bahasa, tuliskan **help**. Anda " +"akan menerima email dengan arahan dan set bahasa yang ada." + +#. type: Plain text +#: en/tsum.text:67 +#, no-wrap +msgid "" +"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" +"large, and you will not be able to receive any of these bundles with a\n" +"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" +"want, send an email to help(a)rt.torproject.org and we\n" +"will give you a list of website mirrors to use.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:73 +msgid "" +"#### How to get Tor as several small sized packages\n" +"It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." +msgstr "" + +#. type: Plain text +#: en/tsum.text:76 +msgid "" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:79 +#, no-wrap +msgid "" +"windows \n" +"split\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:83 +msgid "" +"It is important that you include the keyword *split* on its own line. See " +"*What to do with split packages* for information on how to unpack and re-" +"assemble the small sized packages." +msgstr "" + +#. type: Plain text +#: en/tsum.text:89 +msgid "" +"### Tor for smartphones\n" +"You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:93 +msgid "" +"We also have experimental packages for [Nokia " +"Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " +"iOS](http://sid77.slackware.it/iphone/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:97 +msgid "" +"### How to verify that you have the right version\n" +"Before running the Tor Browser Bundle, you should make sure that you have the right version." +msgstr "" + +#. type: Plain text +#: en/tsum.text:102 +msgid "" +"The software you receive is accompanied by a file with the same name as the " +"bundle and the extension **.asc**. This .asc file is a GPG signature, and " +"will allow you to verify the file you've downloaded is exactly the one that " +"we intended you to get." +msgstr "" +"Perisian yang anda terima adalah bersama dengan fail yang namanya sama " +"dengan nama bundle dan akhiran **.asc**. Fail .asc ialah fail tandatangan " +"GPG, dan membolehkan anda mengesahkan fail yang dimuat turun adalah sama " +"seperti yang sepatutnya anda dapat." + +#. type: Plain text +#: en/tsum.text:105 +#, no-wrap +msgid "" +"Before you can verify the signature, you will have to download and\n" +"install GnuPG: \n" +msgstr "" +"Sebelum anda mengesahkan tandatangan, anda perlu muat turun dan\n" +"install GnuPG: \n" +"\n" + +#. type: Plain text +#: en/tsum.text:109 +#, no-wrap +msgid "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:112 +msgid "" +"Please note that you may need to edit the paths and the commands used below " +"to get it to work on your system." +msgstr "" + +#. type: Plain text +#: en/tsum.text:115 +msgid "" +"Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " +"Erinn's key, run:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:117 +#, no-wrap +msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:119 +msgid "After importing the key, verify that the fingerprint is correct:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:121 +#, no-wrap +msgid "\tgpg --fingerprint 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:123 +msgid "You should see:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:130 +#, no-wrap +msgid "" +"\tpub 2048R/63FEE659 2003-10-16\n" +"\t Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"\tuid Erinn Clark <erinn(a)torproject.org>\n" +"\tuid Erinn Clark <erinn(a)debian.org>\n" +"\tuid Erinn Clark <erinn(a)double-helix.org>\n" +"\tsub 2048R/EB399FD7 2003-10-16\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:132 +msgid "" +"To verify the signature of the package you downloaded, run the following " +"command:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:134 +#, no-wrap +msgid "" +"\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:140 +msgid "" +"The output should say *\"Good signature\"*. A bad signature means that the " +"file may have been tampered with. If you see a bad signature, send details " +"about where you downloaded the package from, how you verified the signature," +" and the output from GnuPG in an email to help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:147 +msgid "" +"Once you have verified the signature and seen the *\"Good signature\"* " +"output, go ahead and extract the package archive. You should then see a " +"directory similar to **tor-browser_en-US**. Inside that directory is another" +" directory called **Docs**, which contains a file called **changelog**. You " +"want to make sure that the version number on the top line of the changelog " +"file matches the version number in the filename." +msgstr "" + +#. type: Plain text +#: en/tsum.text:153 +msgid "" +"### How to use the Tor Browser Bundle\n" +"After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called \"Start Tor Browser\" (or \"start-tor-browser\", depending on your operating system)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:160 +msgid "" +"When you start the Tor Browser Bundle, you will first see Vidalia start up " +"and connect you to the Tor network. After that, you will see a browser " +"confirming that you are now using Tor. This is done by displaying " +"[https://check.torproject.org/](https://check.torproject.org/). You can now " +"browse the Internet through Tor." +msgstr "" + +#. type: Plain text +#: en/tsum.text:163 +#, no-wrap +msgid "" +"*Please note that it is important that you use the browser that comes\n" +"with the bundle, and not your own browser.*\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:169 +msgid "" +"### What to do when Tor does not connect\n" +"Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." +msgstr "" + +#. type: Plain text +#: en/tsum.text:174 +msgid "" +"If your normal Internet connection is working, but Tor still can't connect " +"to the network, try the following; open the Vidalia control panel, click on " +"*Message Log* and select the *Advanced* tab. It may be that Tor won't " +"connect because:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:178 +#, no-wrap +msgid "" +"**Your system clock is off**: Make sure that the date and time on your\n" +"system is correct, and restart Tor. You may need to synchronize your\n" +"system clock with an Internet time server. \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:183 +#, no-wrap +msgid "" +"**You are behind a restrictive firewall**: To tell Tor to only try port\n" +"80 and port 443, open the Vidalia control panel, click on *Settings* and\n" +"*Network*, and tick the box that says *My firewall only lets me connect\n" +"to certain ports*. \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:187 +#, no-wrap +msgid "" +"**Your anti-virus program is blocking Tor**: Make sure that your\n" +"anti-virus program is not preventing Tor from making network\n" +"connections.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:191 +msgid "" +"If Tor still doesn't work, it's likely that your Internet Service Provider " +"(ISP) is blocking Tor. Very often this can be worked around with **Tor " +"bridges**, hidden relays that aren't as easy to block." +msgstr "" + +#. type: Plain text +#: en/tsum.text:195 +msgid "" +"If you need help with figuring out why Tor can't connect, send an email to " +"help(a)rt.torproject.org and include the relevant parts from the log file." +msgstr "" + +#. type: Plain text +#: en/tsum.text:203 +msgid "" +"### How to find a bridge\n" +"To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." +msgstr "" + +#. type: Plain text +#: en/tsum.text:208 +msgid "" +"Configuring more than one bridge address will make your Tor connection more " +"stable, in case some of the bridges become unreachable. There is no " +"guarantee that the bridge you are using now will work tomorrow, so you " +"should make a habit of updating your list of bridges every so often." +msgstr "" + +#. type: Plain text +#: en/tsum.text:214 +msgid "" +"### How to use a bridge\n" +"Once you have a set of bridges to use, open the Vidalia control panel, click on *Settings*, *Network* and tick the box that says *My ISP blocks connections to the Tor network*. Enter the bridges in the box below, hit *OK* and start Tor again." +msgstr "" + +#. type: Plain text +#: en/tsum.text:220 +msgid "" +"### How to use an open proxy\n" +"If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." +msgstr "" + +#. type: Plain text +#: en/tsum.text:223 +msgid "" +"The steps below assume you have a functional Tor/Vidalia configuration, and " +"you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." +msgstr "" + +#. type: Bullet: '1. ' +#: en/tsum.text:235 +msgid "Open the Vidalia control panel, click on *Settings*." +msgstr "" + +#. type: Bullet: '2. ' +#: en/tsum.text:235 +msgid "Click *Network*. Select *I use a proxy to access the Internet*." +msgstr "" + +#. type: Plain text +#: en/tsum.text:235 +#, no-wrap +msgid "" +"3. On the *Address* line, enter the open proxy address. This can be a\n" +"hostname or an IP Address.\n" +"4. Enter the port for the proxy.\n" +"5. Generally, you do not need a username and password. If you do,\n" +"enter the information in the proper fields.\n" +"6. Choose the *Type* of proxy you are using, whether HTTP/HTTPS, SOCKS4,\n" +"or SOCKS5.\n" +"7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" +"proxy to access the rest of the Tor network.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:240 +msgid "" +"## Frequently Asked Questions\n" +"This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:244 +msgid "" +"### Unable to extract the archive\n" +"If you are using Windows and find that you cannot extract the archive, download and install [7-Zip](http://www.7-zip.org/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:248 +msgid "" +"If you are unable to download 7-Zip, try to rename the file from .z to .zip " +"and use winzip to extract the archive. Before renaming the file, tell " +"Windows to show file extensions:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:254 +msgid "" +"#### Windows XP\n" +"1. Open *My Computer*\n" +"2. Click on *Tools* and choose *Folder Options...* in the menu\n" +"3. Click on the *View* tab\n" +"4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:260 +msgid "" +"#### Windows Vista\n" +"1. Open *Computer*\n" +"2. Click on *Organize* and choose *Folder and search options* in the menu\n" +"3. Click on the *View* tab\n" +"4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:266 +msgid "" +"#### Windows 7\n" +"1. Open *Computer*\n" +"2. Click on *Organize* and choose *Folder and search options* in the menu\n" +"3. Click on the *View* tab\n" +" 4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:273 +msgid "" +"### What to do with split packages\n" +"When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." +msgstr "" + +#. type: Plain text +#: en/tsum.text:277 +msgid "" +"Once the unpacking process has completed, you should see a newly created " +"\".exe\" file in the same directory. Run this file and wait for the Tor " +"Browser Bundle to start." +msgstr "" + +#. type: Plain text +#: en/tsum.text:281 +msgid "" +"### Vidalia asks for a password\n" +"You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:287 +#, no-wrap +msgid "" +"**You are already running Vidalia and Tor**:\n" +"For example, this situation can happen if you installed the Vidalia\n" +"bundle and now you're trying to run the Tor Browser Bundle. In that\n" +"case, you will need to close the old Vidalia and Tor before you can run\n" +"this one.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:294 +#, no-wrap +msgid "" +"**Vidalia crashed, but left Tor running**:\n" +"If the dialog that prompts you for a control password has a Reset\n" +"button, you can click the button and Vidalia will restart Tor with a new\n" +"random control password. If you do not see a Reset button, or if Vidalia\n" +"is unable to restart Tor for you; go into your process or task manager,\n" +"and terminate the Tor process. Then use Vidalia to restart Tor.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:298 +msgid "" +"For more information, see the " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " +"Project website." +msgstr "" + +#. type: Plain text +#: en/tsum.text:303 +msgid "" +"### Flash does not work\n" +"For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity." +msgstr "" + +#. type: Plain text +#: en/tsum.text:308 +msgid "" +"Most YouTube videos work with HTML5, and it is possible to view these videos" +" over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" +" on the YouTube website before you can use the HTML5 player." +msgstr "" + +#. type: Plain text +#: en/tsum.text:312 +msgid "" +"Note that the browser will not remember that you joined the trial once you " +"close it, so you will need to re-join the trial the next time you run the " +"Tor Browser Bundle." +msgstr "" + +#. type: Plain text +#: en/tsum.text:315 +msgid "" +"Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" +"/torbutton-faq.html#noflash) for more information." +msgstr "" + +#. type: Plain text +#: en/tsum.text:321 +msgid "" +"### I want to use another browser\n" +"For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks." +msgstr "" + +#. type: Plain text +#: en/tsum.text:325 +msgid "" +"### Why Tor is slow\n" +"Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!" +msgstr "" + +

1 0

[metrics-lib/master] Merge relay and bridge descriptor readers.
by karsten＠torproject.org 15 Jan '12

15 Jan '12

commit 09f9be613307fca70f0eaef8e862981e42fee134 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jan 15 08:12:44 2012 +0100 Merge relay and bridge descriptor readers. --- .../descriptor/BridgeDescriptorReader.java | 11 +- .../descriptor/DescriptorSourceFactory.java | 7 +- .../example/MetricsRelayDescriptorAggregator.java | 4 +- .../example/TorStatusDatabaseUpdater.java | 4 +- .../impl/BridgeDescriptorReaderImpl.java | 106 ------------ .../torproject/descriptor/impl/DescriptorImpl.java | 38 +---- .../descriptor/impl/RelayDescriptorReaderImpl.java | 172 ------------------- .../impl/RelayOrBridgeDescriptorReaderImpl.java | 173 ++++++++++++++++++++ 8 files changed, 193 insertions(+), 322 deletions(-) diff --git a/src/org/torproject/descriptor/BridgeDescriptorReader.java b/src/org/torproject/descriptor/BridgeDescriptorReader.java index fdb30d0..c055557 100644 --- a/src/org/torproject/descriptor/BridgeDescriptorReader.java +++ b/src/org/torproject/descriptor/BridgeDescriptorReader.java @@ -13,11 +13,12 @@ public interface BridgeDescriptorReader { /* Add a local directory to read bridge descriptors from. */ public void addDirectory(File directory); - /* Exclude the given file from the results. */ - public void setExcludeFile(File fileToExclude); - - /* Exclude the given files from the results. */ - public void setExcludeFiles(Set<File> filesToExclude); + /* Exclude files that are contained in the given history file and that + * haven't changed since they were last read. Add reads from the + * current run to the history file. Remove files that don't exist + * anymore from the history file. Lines in the history file contain the + * last modified timestamp and the absolute path of a file. */ + public void setExcludeFiles(File historyFile); /* Read the previously configured bridge descriptors and make them * available via the returned blocking iterator. Whenever the reader diff --git a/src/org/torproject/descriptor/DescriptorSourceFactory.java b/src/org/torproject/descriptor/DescriptorSourceFactory.java index ec7479b..9dcba61 100644 --- a/src/org/torproject/descriptor/DescriptorSourceFactory.java +++ b/src/org/torproject/descriptor/DescriptorSourceFactory.java @@ -2,16 +2,15 @@ * See LICENSE for licensing information */ package org.torproject.descriptor; -import org.torproject.descriptor.impl.RelayDescriptorReaderImpl; +import org.torproject.descriptor.impl.RelayOrBridgeDescriptorReaderImpl; import org.torproject.descriptor.impl.RelayDescriptorDownloaderImpl; -import org.torproject.descriptor.impl.BridgeDescriptorReaderImpl; /* Create descriptor source instances. */ public class DescriptorSourceFactory { /* Create a relay descriptor reader. */ public static RelayDescriptorReader createRelayDescriptorReader() { - return new RelayDescriptorReaderImpl(); + return new RelayOrBridgeDescriptorReaderImpl(); } /* Create a relay descriptor downloader. */ @@ -22,7 +21,7 @@ public class DescriptorSourceFactory { /* Create a bridge descriptor reader. */ public static BridgeDescriptorReader createBridgeDescriptorReader() { - return new BridgeDescriptorReaderImpl(); + return new RelayOrBridgeDescriptorReaderImpl(); } } diff --git a/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java b/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java index 9aa2600..0d9da8d 100644 --- a/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java +++ b/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java @@ -52,8 +52,8 @@ public class MetricsRelayDescriptorAggregator { /* Exclude cached descriptor files that haven't changed since we last * ran this application. */ - reader.setExcludeFile(new File("tor-data-dir/cached-descriptors"), - 1234567890000L); + //reader.setExcludeFile(new File("tor-data-dir/cached-descriptors"), + // 1234567890000L); /* Read descriptors and process them. */ Iterator<DescriptorFile> descriptorFiles = reader.readDescriptors(); diff --git a/src/org/torproject/descriptor/example/TorStatusDatabaseUpdater.java b/src/org/torproject/descriptor/example/TorStatusDatabaseUpdater.java index 428f3b5..f3ee341 100644 --- a/src/org/torproject/descriptor/example/TorStatusDatabaseUpdater.java +++ b/src/org/torproject/descriptor/example/TorStatusDatabaseUpdater.java @@ -35,8 +35,8 @@ public class TorStatusDatabaseUpdater { * ran this application. This may save some execution time. The * application needs to store the information when files were last * modified, because the API is supposed to be stateless. */ - reader.setExcludeFile(new File("tor-data-dir/cached-descriptors"), - 1234567890000L); + //reader.setExcludeFile(new File("tor-data-dir/cached-descriptors"), + // 1234567890000L); /* Read all descriptors in the given directory and import them into * the database. Also go through the list of parsed files and store diff --git a/src/org/torproject/descriptor/impl/BridgeDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/BridgeDescriptorReaderImpl.java deleted file mode 100644 index 04e5d2a..0000000 --- a/src/org/torproject/descriptor/impl/BridgeDescriptorReaderImpl.java +++ /dev/null @@ -1,106 +0,0 @@ -/* Copyright 2011, 2012 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.descriptor.impl; - -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.Stack; -import org.torproject.descriptor.Descriptor; -import org.torproject.descriptor.DescriptorFile; -import org.torproject.descriptor.BridgeDescriptorReader; - -public class BridgeDescriptorReaderImpl - implements BridgeDescriptorReader { - - private List<File> directories = new ArrayList<File>(); - public void addDirectory(File directory) { - this.directories.add(directory); - } - - public void setExcludeFile(File fileToExclude) { - throw new UnsupportedOperationException("Not implemented yet."); - /* TODO Implement me. */ - } - - public void setExcludeFiles(Set<File> filesToExclude) { - throw new UnsupportedOperationException("Not implemented yet."); - /* TODO Implement me. */ - } - - public Iterator<DescriptorFile> readDescriptors() { - BlockingIteratorImpl<DescriptorFile> descriptorQueue = - new BlockingIteratorImpl<DescriptorFile>(); - DescriptorReader reader = new DescriptorReader(this.directories, - descriptorQueue); - new Thread(reader).start(); - return descriptorQueue; - } - - private static class DescriptorReader implements Runnable { - private List<File> directories; - private BlockingIteratorImpl<DescriptorFile> descriptorQueue; - private DescriptorReader(List<File> directories, - BlockingIteratorImpl<DescriptorFile> descriptorQueue) { - this.directories = directories; - this.descriptorQueue = descriptorQueue; - } - public void run() { - for (File directory : this.directories) { - try { - Stack<File> files = new Stack<File>(); - files.add(directory); - while (!files.isEmpty()) { - File file = files.pop(); - if (file.isDirectory()) { - files.addAll(Arrays.asList(file.listFiles())); - } else { - try { - List<Descriptor> parsedDescriptors = this.readFile(file); - DescriptorFileImpl descriptorFile = - new DescriptorFileImpl(); - descriptorFile.setDirectory(directory); - descriptorFile.setFile(file); - descriptorFile.setLastModified(file.lastModified()); - descriptorFile.setDescriptors(parsedDescriptors); - this.descriptorQueue.add(descriptorFile); - } catch (DescriptorParseException e) { - /* TODO Handle me. */ - } - } - } - } catch (IOException e) { - System.err.println("Error while reading descriptors in '" - + directory.getAbsolutePath() + "'."); - /* TODO Handle this exception somehow. */ - } finally { - this.descriptorQueue.setOutOfDescriptors(); - } - } - } - private List<Descriptor> readFile(File file) throws IOException, - DescriptorParseException { - FileInputStream fis = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fis); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len; - byte[] data = new byte[1024]; - while ((len = bis.read(data, 0, 1024)) >= 0) { - baos.write(data, 0, len); - } - bis.close(); - byte[] rawDescriptorBytes = baos.toByteArray(); - return DescriptorImpl.parseBridgeDescriptors(rawDescriptorBytes, - file.getName()); - } - } -} - diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 233b2df..68b70e1 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -14,8 +14,9 @@ import org.torproject.descriptor.Descriptor; public abstract class DescriptorImpl implements Descriptor { - protected static List<Descriptor> parseRelayDescriptors( - byte[] rawDescriptorBytes) throws DescriptorParseException { + protected static List<Descriptor> parseRelayOrBridgeDescriptors( + byte[] rawDescriptorBytes, String fileName) + throws DescriptorParseException { List<Descriptor> parsedDescriptors = new ArrayList<Descriptor>(); byte[] first100Chars = new byte[Math.min(100, rawDescriptorBytes.length)]; @@ -35,32 +36,7 @@ public abstract class DescriptorImpl implements Descriptor { + "network status type in descriptor starting with '" + firstLines + "'."); } - } else if (firstLines.startsWith("router ") || - firstLines.contains("\nrouter ")) { - parsedDescriptors.addAll(ServerDescriptorImpl. - parseDescriptors(rawDescriptorBytes)); - } else if (firstLines.startsWith("extra-info ") || - firstLines.contains("\nextra-info ")) { - parsedDescriptors.addAll(ExtraInfoDescriptorImpl. - parseDescriptors(rawDescriptorBytes)); - } else { - throw new DescriptorParseException("Could not detect relay " - + "descriptor type in descriptor starting with '" + firstLines - + "'."); - } - return parsedDescriptors; - } - - protected static List<Descriptor> parseBridgeDescriptors( - byte[] rawDescriptorBytes, String fileName) - throws DescriptorParseException { - List<Descriptor> parsedDescriptors = new ArrayList<Descriptor>(); - byte[] first100Chars = new byte[Math.min(100, - rawDescriptorBytes.length)]; - System.arraycopy(rawDescriptorBytes, 0, first100Chars, 0, - first100Chars.length); - String firstLines = new String(first100Chars); - if (firstLines.startsWith("r ")) { + } else if (firstLines.startsWith("r ")) { parsedDescriptors.add(new BridgeNetworkStatusImpl( rawDescriptorBytes, fileName)); } else if (firstLines.startsWith("router ") || @@ -72,9 +48,9 @@ public abstract class DescriptorImpl implements Descriptor { parsedDescriptors.addAll(ExtraInfoDescriptorImpl. parseDescriptors(rawDescriptorBytes)); } else { - throw new DescriptorParseException("Could not detect bridge " - + "descriptor type in descriptor starting with '" + firstLines - + "'."); + throw new DescriptorParseException("Could not detect relay or " + + "bridge descriptor type in descriptor starting with '" + + firstLines + "'."); } return parsedDescriptors; } diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java deleted file mode 100644 index 81435e0..0000000 --- a/src/org/torproject/descriptor/impl/RelayDescriptorReaderImpl.java +++ /dev/null @@ -1,172 +0,0 @@ -/* Copyright 2011, 2012 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.descriptor.impl; - -import java.io.BufferedInputStream; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileReader; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.Stack; -import java.util.TreeMap; -import org.torproject.descriptor.Descriptor; -import org.torproject.descriptor.DescriptorFile; -import org.torproject.descriptor.RelayDescriptorReader; -import org.torproject.descriptor.RelayNetworkStatusConsensus; -import org.torproject.descriptor.RelayNetworkStatusVote; - -public class RelayDescriptorReaderImpl implements RelayDescriptorReader { - - private List<File> directories = new ArrayList<File>(); - public void addDirectory(File directory) { - this.directories.add(directory); - } - - private File historyFile; - public void setExcludeFiles(File historyFile) { - this.historyFile = historyFile; - } - - public Iterator<DescriptorFile> readDescriptors() { - BlockingIteratorImpl<DescriptorFile> descriptorQueue = - new BlockingIteratorImpl<DescriptorFile>(); - DescriptorReader reader = new DescriptorReader(this.directories, - descriptorQueue, this.historyFile); - new Thread(reader).start(); - return descriptorQueue; - } - - private static class DescriptorReader implements Runnable { - private List<File> directories; - private BlockingIteratorImpl<DescriptorFile> descriptorQueue; - private File historyFile; - private DescriptorReader(List<File> directories, - BlockingIteratorImpl<DescriptorFile> descriptorQueue, - File historyFile) { - this.directories = directories; - this.descriptorQueue = descriptorQueue; - this.historyFile = historyFile; - } - public void run() { - this.readOldHistory(); - this.readDescriptors(); - this.writeNewHistory(); - } - private SortedMap<String, Long> - oldHistory = new TreeMap<String, Long>(), - newHistory = new TreeMap<String, Long>(); - private void readOldHistory() { - if (this.historyFile == null) { - return; - } - try { - BufferedReader br = new BufferedReader(new FileReader( - this.historyFile)); - String line; - while ((line = br.readLine()) != null) { - if (!line.contains(" ")) { - /* TODO Handle this problem? */ - continue; - } - long lastModifiedMillis = Long.parseLong(line.substring(0, - line.indexOf(" "))); - String absolutePath = line.substring(line.indexOf(" ") + 1); - this.oldHistory.put(absolutePath, lastModifiedMillis); - } - br.close(); - } catch (IOException e) { - /* TODO Handle this exception. */ - } catch (NumberFormatException e) { - /* TODO Handle this exception. */ - } - } - private void writeNewHistory() { - if (this.historyFile == null) { - return; - } - try { - if (this.historyFile.getParentFile() != null) { - this.historyFile.getParentFile().mkdirs(); - } - BufferedWriter bw = new BufferedWriter(new FileWriter( - this.historyFile)); - for (Map.Entry<String, Long> e : this.newHistory.entrySet()) { - String absolutePath = e.getKey(); - long lastModifiedMillis = e.getValue(); - bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath - + "\n"); - } - bw.close(); - } catch (IOException e) { - /* TODO Handle this exception. */ - } - } - private void readDescriptors() { - for (File directory : this.directories) { - try { - Stack<File> files = new Stack<File>(); - files.add(directory); - while (!files.isEmpty()) { - File file = files.pop(); - if (file.isDirectory()) { - files.addAll(Arrays.asList(file.listFiles())); - } else { - String absolutePath = file.getAbsolutePath(); - long lastModifiedMillis = file.lastModified(); - this.newHistory.put(absolutePath, lastModifiedMillis); - if (this.oldHistory.containsKey(absolutePath) && - this.oldHistory.get(absolutePath) == - lastModifiedMillis) { - continue; - } - try { - List<Descriptor> parsedDescriptors = this.readFile(file); - DescriptorFileImpl descriptorFile = - new DescriptorFileImpl(); - descriptorFile.setDirectory(directory); - descriptorFile.setFile(file); - descriptorFile.setLastModified(lastModifiedMillis); - descriptorFile.setDescriptors(parsedDescriptors); - this.descriptorQueue.add(descriptorFile); - } catch (DescriptorParseException e) { - /* TODO Handle me. */ - } - } - } - } catch (IOException e) { - System.err.println("Error while reading descriptors in '" - + directory.getAbsolutePath() + "'."); - /* TODO Handle this exception somehow. */ - } finally { - this.descriptorQueue.setOutOfDescriptors(); - } - } - } - private List<Descriptor> readFile(File file) throws IOException, - DescriptorParseException { - FileInputStream fis = new FileInputStream(file); - BufferedInputStream bis = new BufferedInputStream(fis); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len; - byte[] data = new byte[1024]; - while ((len = bis.read(data, 0, 1024)) >= 0) { - baos.write(data, 0, len); - } - bis.close(); - byte[] rawDescriptorBytes = baos.toByteArray(); - return DescriptorImpl.parseRelayDescriptors(rawDescriptorBytes); - } - } -} - diff --git a/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java new file mode 100644 index 0000000..8e1c3bc --- /dev/null +++ b/src/org/torproject/descriptor/impl/RelayOrBridgeDescriptorReaderImpl.java @@ -0,0 +1,173 @@ +/* Copyright 2011, 2012 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.descriptor.impl; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileReader; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.Stack; +import java.util.TreeMap; +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorFile; +import org.torproject.descriptor.RelayDescriptorReader; +import org.torproject.descriptor.BridgeDescriptorReader; + +public class RelayOrBridgeDescriptorReaderImpl + implements RelayDescriptorReader, BridgeDescriptorReader { + + private List<File> directories = new ArrayList<File>(); + public void addDirectory(File directory) { + this.directories.add(directory); + } + + private File historyFile; + public void setExcludeFiles(File historyFile) { + this.historyFile = historyFile; + } + + public Iterator<DescriptorFile> readDescriptors() { + BlockingIteratorImpl<DescriptorFile> descriptorQueue = + new BlockingIteratorImpl<DescriptorFile>(); + DescriptorReader reader = new DescriptorReader(this.directories, + descriptorQueue, this.historyFile); + new Thread(reader).start(); + return descriptorQueue; + } + + private static class DescriptorReader implements Runnable { + private List<File> directories; + private BlockingIteratorImpl<DescriptorFile> descriptorQueue; + private File historyFile; + private DescriptorReader(List<File> directories, + BlockingIteratorImpl<DescriptorFile> descriptorQueue, + File historyFile) { + this.directories = directories; + this.descriptorQueue = descriptorQueue; + this.historyFile = historyFile; + } + public void run() { + this.readOldHistory(); + this.readDescriptors(); + this.writeNewHistory(); + } + private SortedMap<String, Long> + oldHistory = new TreeMap<String, Long>(), + newHistory = new TreeMap<String, Long>(); + private void readOldHistory() { + if (this.historyFile == null) { + return; + } + try { + BufferedReader br = new BufferedReader(new FileReader( + this.historyFile)); + String line; + while ((line = br.readLine()) != null) { + if (!line.contains(" ")) { + /* TODO Handle this problem? */ + continue; + } + long lastModifiedMillis = Long.parseLong(line.substring(0, + line.indexOf(" "))); + String absolutePath = line.substring(line.indexOf(" ") + 1); + this.oldHistory.put(absolutePath, lastModifiedMillis); + } + br.close(); + } catch (IOException e) { + /* TODO Handle this exception. */ + } catch (NumberFormatException e) { + /* TODO Handle this exception. */ + } + } + private void writeNewHistory() { + if (this.historyFile == null) { + return; + } + try { + if (this.historyFile.getParentFile() != null) { + this.historyFile.getParentFile().mkdirs(); + } + BufferedWriter bw = new BufferedWriter(new FileWriter( + this.historyFile)); + for (Map.Entry<String, Long> e : this.newHistory.entrySet()) { + String absolutePath = e.getKey(); + long lastModifiedMillis = e.getValue(); + bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath + + "\n"); + } + bw.close(); + } catch (IOException e) { + /* TODO Handle this exception. */ + } + } + private void readDescriptors() { + for (File directory : this.directories) { + try { + Stack<File> files = new Stack<File>(); + files.add(directory); + while (!files.isEmpty()) { + File file = files.pop(); + if (file.isDirectory()) { + files.addAll(Arrays.asList(file.listFiles())); + } else { + String absolutePath = file.getAbsolutePath(); + long lastModifiedMillis = file.lastModified(); + this.newHistory.put(absolutePath, lastModifiedMillis); + if (this.oldHistory.containsKey(absolutePath) && + this.oldHistory.get(absolutePath) == + lastModifiedMillis) { + continue; + } + try { + List<Descriptor> parsedDescriptors = this.readFile(file); + DescriptorFileImpl descriptorFile = + new DescriptorFileImpl(); + descriptorFile.setDirectory(directory); + descriptorFile.setFile(file); + descriptorFile.setLastModified(lastModifiedMillis); + descriptorFile.setDescriptors(parsedDescriptors); + this.descriptorQueue.add(descriptorFile); + } catch (DescriptorParseException e) { + /* TODO Handle me. */ + } + } + } + } catch (IOException e) { + System.err.println("Error while reading descriptors in '" + + directory.getAbsolutePath() + "'."); + /* TODO Handle this exception somehow. */ + } finally { + this.descriptorQueue.setOutOfDescriptors(); + } + } + } + private List<Descriptor> readFile(File file) throws IOException, + DescriptorParseException { + FileInputStream fis = new FileInputStream(file); + BufferedInputStream bis = new BufferedInputStream(fis); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + int len; + byte[] data = new byte[1024]; + while ((len = bis.read(data, 0, 1024)) >= 0) { + baos.write(data, 0, len); + } + bis.close(); + byte[] rawDescriptorBytes = baos.toByteArray(); + return DescriptorImpl.parseRelayOrBridgeDescriptors( + rawDescriptorBytes, file.getName()); + } + } +} +

1 0