- tor-commits - lists.torproject.org

[doctor/master] Fix error message.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 561ffcecea6f8d466c05719dfd06442a14c3e64f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 11:38:53 2012 +0100 Fix error message. --- src/org/torproject/doctor/StatusFileReport.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 18def6f..040a687 100644 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -50,8 +50,9 @@ public class StatusFileReport { String line; while ((line = br.readLine()) != null) { if (!line.contains(": ")) { - System.err.println("Bad line in stats/chc-last-warned: '" - + line + "'. Ignoring this line."); + System.err.println("Bad line in " + + lastWarnedFile.getAbsolutePath() + ": '" + line + + "'. Ignoring this line."); continue; } long warnedMillis = Long.parseLong(line.substring(0,

1 0

[stem/master] Minor update to stem/util/conf.py
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 6c5f0205682877c76d6633abce487673787f5d9b Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Jan 14 21:32:31 2012 +0530 Minor update to stem/util/conf.py - More pythonic way of doing File I/O - Use try and catch the exception while parsing the config file instead of using an if-else logic. - Log messages when the (key, value) are not provided in the proper format in the config file. - Typos --- stem/util/conf.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 4c468d7..c226f40 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -150,9 +150,8 @@ class Config(): permissions, etc) """ - config_file = open(path, "r") - read_contents = config_file.readlines() - config_file.close() + with open(path, "r") as config_file: + read_contents = config_file.readlines() self._contents_lock.acquire() self._raw_contents = read_contents @@ -165,11 +164,12 @@ class Config(): # parse the key/value pair if line: - if " " in line: + try: key, value = line.split(" ", 1) - value = value.strip() - else: + except ValueError: + log.debug("Config entry '%s' is expected to be of the format 'Key Value', defaulting to '%s' -> ''" % (line, line)) key, value = line, "" + value = value.strip() self.set(key, value) @@ -333,7 +333,7 @@ class Config(): def get_value(self, key, default = None, multiple = False): """ - This provides the currently value associated with a given key. + This provides the current value associated with a given key. Arguments: key (str) - config setting to be fetched

1 0

[stem/master] Add stem.util.conf.save()
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 451e13eb9552ab448072b863b180a338a4baeb24 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sun Jan 15 23:16:06 2012 +0530 Add stem.util.conf.save() This saves all the contents in the config file. It overwrites the contents of the original config file. The comments of the original file will be lost. --- stem/util/conf.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index c226f40..0c98206 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -439,3 +439,11 @@ class Config(): return default else: return [int(val) for val in conf_comp] + def save(self): + self._contents_lock.acquire() + + with open(path, 'w') as f: + for entry in self.keys(): + f.write('%s %s\n' % (entry, self.get(entry))) + + self._contents_lock.release()

1 0

[stem/master] Minor fixes for conf.save()
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 94479aadebcaeee26d57b91e4900dad56edaeb91 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jan 15 22:13:32 2012 -0800 Minor fixes for conf.save() Sorting the keys prior to saving, handling multi-value keys, and trivial changes (whitespace, reordering, and putting the strip call in the try block which is the only place it's needed). --- stem/util/conf.py | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 0c98206..199a20c 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -15,6 +15,7 @@ would be loaded as four entries, the last one's value being an empty string. get_config - Singleton for getting configurations Config - Custom configuration. |- load - reads a configuration file + |- save - writes the current configuration to a file |- clear - empties our loaded configuration contents |- update - replaces mappings in a dictionary with the config's values |- keys - provides keys in the loaded configuration @@ -166,16 +167,29 @@ class Config(): if line: try: key, value = line.split(" ", 1) + value = value.strip() except ValueError: log.debug("Config entry '%s' is expected to be of the format 'Key Value', defaulting to '%s' -> ''" % (line, line)) key, value = line, "" - value = value.strip() self.set(key, value) self._path = path self._contents_lock.release() + def save(self): + self._contents_lock.acquire() + + config_keys = self.keys() + config_keys.sort() + + with open(path, 'w') as f: + for entry_key in config_keys: + for entry_value in self.get_value(entry_key, multiple = True): + f.write('%s %s\n' % (entry_key, entry_value)) + + self._contents_lock.release() + def clear(self): """ Drops the configuration contents and reverts back to a blank, unloaded @@ -439,11 +453,3 @@ class Config(): return default else: return [int(val) for val in conf_comp] - def save(self): - self._contents_lock.acquire() - - with open(path, 'w') as f: - for entry in self.keys(): - f.write('%s %s\n' % (entry, self.get(entry))) - - self._contents_lock.release()

1 0

r25307: {website} update the mirrors with two new sites. (in website/trunk: . include)
by Andrew Lewman 16 Jan '12

16 Jan '12

Author: phobos Date: 2012-01-16 00:39:25 +0000 (Mon, 16 Jan 2012) New Revision: 25307 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update the mirrors with two new sites. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-01-13 00:30:29 UTC (rev 25306) +++ website/trunk/include/mirrors-table.wmi 2012-01-16 00:39:25 UTC (rev 25307) @@ -188,23 +188,6 @@ <tr> - <td>AT</td> - - <td>FoDT.IT</td> - - <td>Up to date</td> - - <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> - <td><a href="http://tor.fodt.it/dist/">http</a></td> - <td><a href="http://tor.fodt.it/">http</a></td> - <td><a href="https://tor.fodt.it/dist/">https</a></td> - <td><a href="https://tor.fodt.it/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>FR</td> <td>BarkerJr</td> @@ -341,23 +324,6 @@ <tr> - <td>US</td> - - <td>NW Linux</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> -</tr> - -<tr> - <td>DE</td> <td>borgmann.tv</td> @@ -443,49 +409,49 @@ <tr> - <td>SE</td> + <td>DE</td> - <td>homosu</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>IS</td> - <td>[[:bbs:]]</td> + <td>TheOnionRouter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</a></td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>SE</td> - <td>CoralCDN</td> + <td>homosu</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -494,17 +460,17 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>crypto.is</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="https://torproject.crypto.is/dist/">http</a></td> - <td><a href="https://torproject.crypto.is/">http</a></td> - <td><a href="https://torproject.crypto.is/dist/">https</a></td> - <td><a href="https://torproject.crypto.is/">https</a></td> + <td><a href="http://tor.blingblingsquad.net/dist">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> @@ -513,17 +479,17 @@ <td>IS</td> - <td>TheOnionRouter</td> + <td>crypto.is</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td><a href="http://theonionrouter.com/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">http</a></td> + <td><a href="https://torproject.crypto.is/">http</a></td> + <td><a href="https://torproject.crypto.is/dist/">https</a></td> + <td><a href="https://torproject.crypto.is/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -664,6 +630,40 @@ <tr> + <td>AT</td> + + <td>FoDT.IT</td> + + <td>Unknown</td> + + <td><a href="ftp://ftp.fodt.it/pub/mirror/tor/">ftp</a></td> + <td><a href="http://tor.fodt.it/dist/">http</a></td> + <td><a href="http://tor.fodt.it/">http</a></td> + <td><a href="https://tor.fodt.it/dist/">https</a></td> + <td><a href="https://tor.fodt.it/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>NW Linux</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> +</tr> + +<tr> + <td>NL</td> <td></td> @@ -678,3 +678,37 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td></td> + + <td>torland</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://mirror.torland.me/dist/">http</a></td> + <td><a href="http://mirror.torland.me/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-01-13 00:30:29 UTC (rev 25306) +++ website/trunk/update-mirrors.pl 2012-01-16 00:39:25 UTC (rev 25307) @@ -839,6 +839,42 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror051 => { + adminContact => "", + orgName => "torland", + isoCC => "", + subRegion => "", + region => "", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.torland.me/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.torland.me/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + }, + mirror052 => { + adminContact => "", + orgName => "spline", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://tor.spline.de/", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "rsync://ftp.spline.de/tor", + ftpWebsiteMirror => "ftp://ftp.spline.de/pub/tor", + httpDistMirror => "http://tor.spline.de/dist/", + httpsDistMirror => "", + rsyncDistMirror => "rsync://ftp.spline.de/tor/dist", + hiddenServiceMirror => "", } );

1 0

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

15 Jan '12

commit c0f3cfd99edbfb65f4423dbc9cf43d3575183401 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 15 22:45:06 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 93537b4..9e6e4e1 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">gebruik de ingebouwde iptables binary in plaats van degene gekoppeld aan Orbot</string> - <string name="error_installing_binares"></string> + <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables binary in plaats van de aan Orbot gekoppelde.</string> + <string name="error_installing_binares">De Tor binaries konden niet worden geïnstalleerd of geüpgraded.</string> </resources>

1 0

[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