tor-commits August 2012

tor-commits@lists.torproject.org

19 participants
901 discussions

[tor/master] Merge remote-tracking branch 'sysrqb/bug6518'
by nickm＠torproject.org 02 Aug '12

02 Aug '12

commit 65d8448209633cb5f8f7804c309f537e8ac4b803 Merge: d91bbf3 a47e434 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 2 15:45:10 2012 -0400 Merge remote-tracking branch 'sysrqb/bug6518' src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[metrics-tasks/master] Graphing code for fast exits graphs (#6498).
by karsten＠torproject.org 02 Aug '12

02 Aug '12

commit 80c885ec4b89986374c699939ff9611cbfebc07e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 19:04:02 2012 +0200 Graphing code for fast exits graphs (#6498). --- task-6498/.gitignore | 2 + task-6498/plot.R | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 0 deletions(-) diff --git a/task-6498/.gitignore b/task-6498/.gitignore index 9dc71c8..707150a 100644 --- a/task-6498/.gitignore +++ b/task-6498/.gitignore @@ -4,4 +4,6 @@ lib/ bin/ in/ results.csv +Rplots.pdf +*.png diff --git a/task-6498/plot.R b/task-6498/plot.R new file mode 100644 index 0000000..9f7763d --- /dev/null +++ b/task-6498/plot.R @@ -0,0 +1,77 @@ +# uncomment for 2+ years +#CUTOFF <- "2010-05-26" +#DETAIL <- "week" +CUTOFF <- "2012-06-02" +DETAIL <- "day" + +require(ggplot2) +require(reshape) +require(RColorBrewer) +data <- read.csv("results.csv", stringsAsFactors = FALSE) +data <- data[data$valid_after >= paste(CUTOFF, "00:00:00"), ] + +r <- data +r <- r[r$min_rate == 11875 & r$ports == "80-443-554-1755" & + r$min_advbw == 5000, ] +r <- aggregate(list(relays = r$relays, P_exit = 100 * r$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(r$valid_after), DETAIL))), + FUN = median) +r <- melt(r, id.vars = c("date")) +r <- data.frame(r, type = ifelse(r$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) +ggplot(r, aes(x = date, y = value)) + +geom_line(colour = "purple", size = 0.75) + +facet_grid(type ~ ., scales = "free_y") + +scale_x_date(name = "") + +scale_y_continuous(name = "") + +scale_colour_manual(values = c("purple", "orange")) + +opts(title = paste("Fast relays (95+ Mbit/s configured bandwidth rate,\n", + "5000+ KB/s advertised bandwidth capacity,\n", + "exit to ports 80, 443, 554, and 1755,\n", + "at most 2 relays per /24 network)\n", sep = "")) +ggsave("fast-exits.png", width = 8, height = 6, dpi = 100) + +s <- data +s <- s[s$min_rate == 11875 & s$ports == "80-443-554-1755", ] +s <- aggregate(list(relays = s$relays, P_exit = 100 * s$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(s$valid_after), DETAIL)), + min_advbw = s$min_advbw), FUN = median) +s <- melt(s, id.vars = c("date", "min_advbw")) +s <- data.frame(s, type = ifelse(s$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) +ggplot(s, aes(x = date, y = value, colour = as.factor(min_advbw))) + +geom_line() + +facet_grid(type ~ ., scales = "free_y") + +scale_x_date(name = "") + +scale_y_continuous(name = "") + +scale_colour_manual(name = "Advertised bandwidth (in KB/s)", + values = brewer.pal(6, "Purples")[2:6]) + +opts(title = paste("Relays meeting the fast-exit requirements\nwith", + "varying minimum advertised bandwidth capacities"), + legend.position = "top") +ggsave("advertised-bandwidths-requirement.png", width = 8, height = 6, + dpi = 100) + +t <- data +t1 <- t[t$min_rate == 11875 & t$ports == "80-443-554-1755" & + t$min_advbw == 5000, ] +t2 <- t[t$min_rate == 10000 & t$ports == "80-443" & + t$min_advbw == 2000, ] +t <- rbind(data.frame(t1, var = "95+ Mbit/s, 5000+ KB/s, 80/443/554/1755"), + data.frame(t2, var = "80+ Mbit/s, 2000+ KB/s, 80/443")) +t <- aggregate(list(relays = t$relays, P_exit = 100 * t$exit_prob), + by = list(date = as.Date(cut.Date(as.Date(t$valid_after), DETAIL)), + var = t$var), FUN = median) +t <- melt(t, id.vars = c("date", "var")) +t <- data.frame(t, type = ifelse(t$variable == "P_exit", + "Total exit probability (in %)", "Number of relays")) +ggplot(t, aes(x = date, y = value, colour = var)) + +geom_line(size = 0.75) + +facet_grid(type ~ ., scales = "free_y") + +scale_x_date(name = "") + +scale_y_continuous(name = "") + +scale_colour_manual(name = "", values = c("purple", "orange")) + +opts(title = "Relays almost meeting the fast-exit requirements", + legend.position = "top") +ggsave("almost-fast-exits.png", width = 8, height = 6, dpi = 100) +

1 0

[metrics-tasks/master] Extract data for fast exits graphs (#6498).
by karsten＠torproject.org 02 Aug '12

02 Aug '12

commit 48886a04dfa052caaa2b9337ff45b95ebb12747f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Aug 2 14:50:52 2012 +0200 Extract data for fast exits graphs (#6498). --- task-6498/.gitignore | 7 + task-6498/download.sh | 4 + task-6498/run.sh | 3 + task-6498/src/Main.java | 279 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 293 insertions(+), 0 deletions(-) diff --git a/task-6498/.gitignore b/task-6498/.gitignore new file mode 100644 index 0000000..9dc71c8 --- /dev/null +++ b/task-6498/.gitignore @@ -0,0 +1,7 @@ +.classpath +.project +lib/ +bin/ +in/ +results.csv + diff --git a/task-6498/download.sh b/task-6498/download.sh new file mode 100755 index 0000000..b6cb15d --- /dev/null +++ b/task-6498/download.sh @@ -0,0 +1,4 @@ +#!/bin/bash +rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/consensuses in +rsync -arz --delete metrics.torproject.org::metrics-recent/relay-descriptors/server-descriptors in + diff --git a/task-6498/run.sh b/task-6498/run.sh new file mode 100755 index 0000000..8621cfd --- /dev/null +++ b/task-6498/run.sh @@ -0,0 +1,3 @@ +#!/bin/bash +javac -d bin/ -cp lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar src/Main.java && java -Xmx2g -cp bin/:lib/descriptor.jar:lib/commons-codec-1.6.jar:lib/commons-compress-1.4.1.jar Main + diff --git a/task-6498/src/Main.java b/task-6498/src/Main.java new file mode 100644 index 0000000..2a59a13 --- /dev/null +++ b/task-6498/src/Main.java @@ -0,0 +1,279 @@ +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; + +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorFile; +import org.torproject.descriptor.DescriptorReader; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.NetworkStatusEntry; +import org.torproject.descriptor.RelayNetworkStatusConsensus; +import org.torproject.descriptor.ServerDescriptor; + +public class Main { + public static void main(String[] args) throws IOException { + + /* Parse server descriptors in in/server-descriptors/, not keeping a + * parse history, and memorize bandwidth rate, burst, and observed + * bandwidth for every server descriptor. */ + System.out.print(new Date() + ": Parsing server descriptors"); + int parsedServerDescriptors = 0; + DescriptorReader descriptorReader = + DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addDirectory(new File("in/server-descriptors")); + Iterator<DescriptorFile> descriptorFiles = + descriptorReader.readDescriptors(); + Map<String, int[]> serverDescriptors = new HashMap<String, int[]>(); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof ServerDescriptor)) { + continue; + } + if (++parsedServerDescriptors >= 1000) { + System.out.print("."); + parsedServerDescriptors = 0; + } + ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; + String digest = serverDescriptor.getServerDescriptorDigest(); + int[] bandwidths = new int[] { + serverDescriptor.getBandwidthRate() / 1024, + serverDescriptor.getBandwidthBurst() / 1024, + serverDescriptor.getBandwidthObserved() / 1024 }; + serverDescriptors.put(digest.toUpperCase(), bandwidths); + } + } + + /* Parse consensuses in in/consensuses/, keeping a parse history. */ + System.out.print("\n" + new Date() + ": Parsing consensuses"); + descriptorReader = DescriptorSourceFactory.createDescriptorReader(); + descriptorReader.addDirectory(new File("in/consensuses")); + /* TODO When running this program in a cronjob, add a history file + * using descriptorReader.setExcludeFiles() and set the file writer + * below to append mode instead of overwrite mode. */ + descriptorFiles = descriptorReader.readDescriptors(); + BufferedWriter bw = new BufferedWriter(new FileWriter("results.csv")); + bw.write("valid_after,min_rate,min_advbw,ports,relays,exit_prob\n"); + while (descriptorFiles.hasNext()) { + DescriptorFile descriptorFile = descriptorFiles.next(); + for (Descriptor descriptor : descriptorFile.getDescriptors()) { + if (!(descriptor instanceof RelayNetworkStatusConsensus)) { + continue; + } + RelayNetworkStatusConsensus consensus = + (RelayNetworkStatusConsensus) descriptor; + SimpleDateFormat dateTimeFormat = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String validAfter = dateTimeFormat.format( + consensus.getValidAfterMillis()); + System.out.print("."); + SortedMap<String, Integer> bandwidthWeights = + consensus.getBandwidthWeights(); + if (bandwidthWeights == null) { + continue; + } + SortedSet<String> weightKeys = new TreeSet<String>(Arrays.asList( + "Wee,Wed".split(","))); + weightKeys.removeAll(bandwidthWeights.keySet()); + if (!weightKeys.isEmpty()) { + continue; + } + double wee = ((double) bandwidthWeights.get("Wee")) / 10000.0, + wed = ((double) bandwidthWeights.get("Wed")) / 10000.0; + SortedSet<String> fingerprints = new TreeSet<String>(); + Map<String, Double> exitWeights = new HashMap<String, Double>(); + double totalExitWeight = 0.0; + Map<String, Integer> bandwidthRates = + new HashMap<String, Integer>(); + Map<String, Integer> advertisedBandwidths = + new HashMap<String, Integer>(); + Map<String, Set<Integer>> exitPorts = + new HashMap<String, Set<Integer>>(); + Map<String, String> addressParts = new HashMap<String, String>(); + for (NetworkStatusEntry relay : + consensus.getStatusEntries().values()) { + String fingerprint = relay.getFingerprint(); + fingerprints.add(fingerprint); + if (!relay.getFlags().contains("Running")) { + continue; + } + boolean isExit = relay.getFlags().contains("Exit") && + !relay.getFlags().contains("BadExit"); + boolean isGuard = relay.getFlags().contains("Guard"); + String serverDescriptorDigest = relay.getDescriptor(). + toUpperCase(); + int[] descriptorBandwidths = serverDescriptors.get( + serverDescriptorDigest); + int bandwidthRate = 0, advertisedBandwidth = 0; + if (descriptorBandwidths != null) { + bandwidthRate = descriptorBandwidths[0]; + advertisedBandwidth = Math.min(Math.min( + descriptorBandwidths[0], + descriptorBandwidths[1]), + descriptorBandwidths[2]); + } + bandwidthRates.put(fingerprint, bandwidthRate); + advertisedBandwidths.put(fingerprint, advertisedBandwidth); + double exitWeight = (double) relay.getBandwidth(); + if (isGuard && isExit) { + exitWeight *= wed; + } else if (isGuard) { + exitWeight = 0.0; + } else if (isExit) { + exitWeight *= wee; + } else { + exitWeight = 0.0; + } + exitWeights.put(fingerprint, exitWeight); + totalExitWeight += exitWeight; + exitPorts.put(fingerprint, new HashSet<Integer>()); + if (relay.getDefaultPolicy() != null && + relay.getPortList() != null) { + boolean acceptPolicy = relay.getDefaultPolicy().equals( + "accept"); + Set<Integer> policyPorts = new HashSet<Integer>(); + List<Integer> relevantPorts = new ArrayList<Integer>(); + relevantPorts.add(80); + relevantPorts.add(443); + relevantPorts.add(554); + relevantPorts.add(1755); + for (String part : relay.getPortList().split(",")) { + int from, to; + if (part.contains("-")) { + from = Integer.parseInt(part.split("-")[0]); + to = Integer.parseInt(part.split("-")[1]); + } else { + from = to = Integer.parseInt(part); + } + while (!relevantPorts.isEmpty() && + from > relevantPorts.get(0)) { + relevantPorts.remove(0); + } + while (!relevantPorts.isEmpty() && + from <= relevantPorts.get(0) && + to >= relevantPorts.get(0)) { + policyPorts.add(relevantPorts.remove(0)); + } + } + for (int port : new int[] { 80, 443, 554, 1755}) { + if (!policyPorts.contains(port) ^ acceptPolicy) { + exitPorts.get(fingerprint).add(port); + } + } + } + String address = relay.getAddress(); + addressParts.put(fingerprint, address.substring(0, + address.lastIndexOf("."))); + } + + /* For the default setting, filter relays which have a bandwidth + * rate >= 11875 KB/s, advertised bandwidth >= 5000 KB/s, and + * which permit exiting to ports 80, 443, 554, and 1755. Only + * consider the fastest 2 relays per /24 with respect to exit + * probability. Also vary requirements. Overall, analyze these + * settings: + * - rate >= 11875, advbw >= 5000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 5000, exit to 80, 443 + * - rate >= 11875, advbw >= 4000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 3000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 2000, exit to 80, 443, 554, 1755 + * - rate >= 11875, advbw >= 1000, exit to 80, 443, 554, 1755 + * - rate >= 10000, advbw >= 2000, exit to 80, 443 */ + int[] minimumBandwidthRates = new int[] { 11875, 11875, 11875, + 11875, 11875, 11875, 10000 }; + int[] minimumAdvertisedBandwidths = new int[] { 5000, 5000, 4000, + 3000, 2000, 1000, 2000 }; + Set<Integer> defaultPorts = new HashSet<Integer>(); + defaultPorts.add(80); + defaultPorts.add(443); + defaultPorts.add(554); + defaultPorts.add(1755); + Set<Integer> reducedPorts = new HashSet<Integer>(); + reducedPorts.add(80); + reducedPorts.add(443); + List<Set<Integer>> requiredPorts = new ArrayList<Set<Integer>>(); + requiredPorts.add(defaultPorts); + requiredPorts.add(reducedPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(defaultPorts); + requiredPorts.add(reducedPorts); + for (int i = 0; i < minimumBandwidthRates.length; i++) { + int minimumBandwidthRate = minimumBandwidthRates[i]; + int minimumAdvertisedBandwidth = minimumAdvertisedBandwidths[i]; + Set<Integer> minimumRequiredPorts = requiredPorts.get(i); + Map<String, List<Double>> exitWeightFractionsByAddressParts = + new HashMap<String, List<Double>>(); + for (String fingerprint : fingerprints) { + int bandwidthRate = bandwidthRates.get(fingerprint); + int advertisedBandwidth = advertisedBandwidths.get( + fingerprint); + Set<Integer> allowedExitPorts = exitPorts.get(fingerprint); + if (bandwidthRate < minimumBandwidthRate || + advertisedBandwidth < minimumAdvertisedBandwidth || + !allowedExitPorts.containsAll(minimumRequiredPorts)) { + continue; + } + double exitWeightFraction = exitWeights.get(fingerprint) + / totalExitWeight; + String addressPart = addressParts.get(fingerprint); + if (!exitWeightFractionsByAddressParts.containsKey( + addressPart)) { + exitWeightFractionsByAddressParts.put(addressPart, + new ArrayList<Double>()); + } + exitWeightFractionsByAddressParts.get(addressPart).add( + exitWeightFraction); + } + double totalExitWeightFraction = 0.0; + int totalRelays = 0; + for (List<Double> weightFractions : + exitWeightFractionsByAddressParts.values()) { + Collections.sort(weightFractions); + while (weightFractions.size() > 2) { + weightFractions.remove(0); + } + for (double weightFraction : weightFractions) { + totalExitWeightFraction += weightFraction; + totalRelays++; + } + } + + /* For each setting, append results to results.csv: + * - valid_after: consensus valid-after time + * - min_rate: minimum bandwidth rate in KB/s + * - min_advbw: minimum advertised bandwidth in KB/s + * - ports: "80-443" or "80-443-554-1755" + * - relays: number of relays matching the requirements + * - exit_prob: sum of exit probabilities */ + bw.write(String.format("%s,%d,%d,%s,%d,%.4f%n", + validAfter, minimumBandwidthRate, + minimumAdvertisedBandwidth, minimumRequiredPorts.size() <= 2 + ? "80-443" : "80-443-554-1755", totalRelays, + totalExitWeightFraction)); + } + } + } + bw.close(); + System.out.println("\n" + new Date() + ": Terminating."); + } +} +

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Aug '12

02 Aug '12

commit ab4ded51c35597b99f1d5848b5dd9594eddbbcd1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 2 17:15:08 2012 +0000 Update translations for vidalia --- th/vidalia_th.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/th/vidalia_th.po b/th/vidalia_th.po index dda6d91..8efa220 100644 --- a/th/vidalia_th.po +++ b/th/vidalia_th.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-02 16:44+0000\n" +"PO-Revision-Date: 2012-08-02 17:05+0000\n" "Last-Translator: bsalt <bsalt_37(a)mailbolt.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -27,15 +27,15 @@ msgstr "ลิขสิทธิ" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "" +msgstr "Vidalia 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "" +msgstr "Tor 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "" +msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." @@ -335,7 +335,7 @@ msgstr "" msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "" +msgstr "ประเทศ" msgctxt "BridgeUsageDialog" msgid "# Clients" @@ -597,27 +597,27 @@ msgstr "เคปเวิร์ด" msgctxt "CountryInfo" msgid "Central African Republic" -msgstr "" +msgstr "สาธารณรัฐแอฟริกากลาง" msgctxt "CountryInfo" msgid "Chad" -msgstr "" +msgstr "ชาด" msgctxt "CountryInfo" msgid "Chile" -msgstr "" +msgstr "ชิลี" msgctxt "CountryInfo" msgid "China" -msgstr "" +msgstr "จีน" msgctxt "CountryInfo" msgid "Colombia" -msgstr "" +msgstr "โคลอมเบีย" msgctxt "CountryInfo" msgid "Comoros" -msgstr "" +msgstr "คอโมโรส" msgctxt "CountryInfo" msgid "Congo, The Democratic Republic of the" @@ -1185,7 +1185,7 @@ msgstr "" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "ซาอีร์" msgctxt "CountryInfo" msgid "Albania" @@ -2550,7 +2550,7 @@ msgstr "" msgctxt "NetViewer" msgid "Ctrl+F" -msgstr "" +msgstr "Ctrl+F" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" @@ -3661,7 +3661,7 @@ msgstr "" msgctxt "UpdateProgressDialog" msgid "OK" -msgstr "" +msgstr "OK" msgctxt "UpdateProgressDialog" msgid "Software Updates" @@ -3820,19 +3820,19 @@ msgstr "" msgctxt "stringutil.h" msgid "%1 B/s" -msgstr "" +msgstr "%1 B/s" msgctxt "stringutil.h" msgid "%1 KB/s" -msgstr "" +msgstr "%1 KB/s" msgctxt "stringutil.h" msgid "%1 MB/s" -msgstr "" +msgstr "%1 MB/s" msgctxt "stringutil.h" msgid "%1 GB/s" -msgstr "" +msgstr "%1 GB/s" msgctxt "stringutil.h" msgid "%1 days"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 02 Aug '12

02 Aug '12

commit fc4b91f05e06e0cee40b3ccf186196af5912eb1a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 2 16:45:13 2012 +0000 Update translations for vidalia --- th/vidalia_th.po | 55 +++++++++++++++++++++++++++-------------------------- 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/th/vidalia_th.po b/th/vidalia_th.po index 921466a..dda6d91 100644 --- a/th/vidalia_th.po +++ b/th/vidalia_th.po @@ -1,13 +1,14 @@ # # Translators: +# <bsalt_37(a)mailbolt.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-03-22 08:51+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-02 16:44+0000\n" +"Last-Translator: bsalt <bsalt_37(a)mailbolt.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -488,15 +489,15 @@ msgstr "การตอบกลับการควบคุม ไม่ถ msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "อัฟกานิสถาน" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "อันดอร์รา" msgctxt "CountryInfo" msgid "Angola" -msgstr "" +msgstr "แองโกลา" msgctxt "CountryInfo" msgid "Antigua & Barbuda" @@ -504,51 +505,51 @@ msgstr "" msgctxt "CountryInfo" msgid "Argentina" -msgstr "" +msgstr "อาร์เจนตินา" msgctxt "CountryInfo" msgid "Armenia" -msgstr "" +msgstr "อาร์เมเนีย" msgctxt "CountryInfo" msgid "Australia" -msgstr "" +msgstr "ออสเตรเลีย" msgctxt "CountryInfo" msgid "Azerbaijan" -msgstr "" +msgstr "อาเซอร์ไบจัน" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "" +msgstr "บาฮามาส" msgctxt "CountryInfo" msgid "Bangladesh" -msgstr "" +msgstr "บังคลาเทศ" msgctxt "CountryInfo" msgid "Barbados" -msgstr "" +msgstr "บาร์เบโดส" msgctxt "CountryInfo" msgid "Belarus" -msgstr "" +msgstr "เบลารุส" msgctxt "CountryInfo" msgid "Belgium" -msgstr "" +msgstr "เบลเยี่ยม" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "เบลีซ" msgctxt "CountryInfo" msgid "Bhutan" -msgstr "" +msgstr "ภูฐาน" msgctxt "CountryInfo" msgid "Bolivia" -msgstr "" +msgstr "โบลิเวีย" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" @@ -556,43 +557,43 @@ msgstr "" msgctxt "CountryInfo" msgid "Botswana" -msgstr "" +msgstr "บอตสวานา" msgctxt "CountryInfo" msgid "Brazil" -msgstr "" +msgstr "บราซิล" msgctxt "CountryInfo" msgid "Brunei Darussalam" -msgstr "" +msgstr "บรูไนดารุสซาลาม" msgctxt "CountryInfo" msgid "Bulgaria" -msgstr "" +msgstr "บัลแกเรีย" msgctxt "CountryInfo" msgid "Burkina Faso" -msgstr "" +msgstr "บูร์กินาฟาโซ" msgctxt "CountryInfo" msgid "Burundi" -msgstr "" +msgstr "บุรุนดี" msgctxt "CountryInfo" msgid "Cambodia" -msgstr "" +msgstr "กัมพูชา" msgctxt "CountryInfo" msgid "Cameroon" -msgstr "" +msgstr "แคเมอรูน" msgctxt "CountryInfo" msgid "Canada" -msgstr "" +msgstr "แคนาดา" msgctxt "CountryInfo" msgid "Cape Verde" -msgstr "" +msgstr "เคปเวิร์ด" msgctxt "CountryInfo" msgid "Central African Republic"

1 0

[flashproxy/master] Remove tor-ignore-bridge-failure.patch.
by dcf＠torproject.org 02 Aug '12

02 Aug '12

commit 1116e0853a678f46511c75dac166cda4d340dc79 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Aug 2 08:38:47 2012 -0700 Remove tor-ignore-bridge-failure.patch. I haven't used this patch in a long time; it may be that it never did anything. I think the problems with reconnecting to a bridge had more to do with LearnCircuitBuildTimeout, which is now worked around in the configuration. --- README | 8 -------- patches/tor-ignore-bridge-failure.patch | 19 ------------------- 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/README b/README index d6ad66d..f814ebe 100644 --- a/README +++ b/README @@ -85,14 +85,6 @@ port forwarding. Make sure someone is viewing http://crypto.stanford.edu/flashproxy/, or another web page with a flash proxy badge on it. -Sometimes Tor can think that the bridge you reach through a proxy is -unreachable after the proxy is disconnected, even if there is another -proxy immediately available. If you are able to build Tor from source, -try applying the patch patches/tor-ignore-bridge-failure.patch. - $ git apply ~/flashproxy/patches/tor-ignore-bridge-failure.patch -or - $ patch -p1 < ~/flashproxy/patches/tor-ignore-bridge-failure.patch - If tor hangs at 10% with these messages: [notice] Bootstrapped 10%: Finishing handshake with directory server. [notice] no known bridge descriptors running yet; stalling diff --git a/patches/tor-ignore-bridge-failure.patch b/patches/tor-ignore-bridge-failure.patch deleted file mode 100644 index dd7290b..0000000 --- a/patches/tor-ignore-bridge-failure.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch causes Tor to ignore bridge reachability failures. This is -helpful when the bridge is only intermittently available, as when -connecting through a flash proxy. - -diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c -index f7d5524..0ffcf06 100644 ---- a/src/or/circuitbuild.c -+++ b/src/or/circuitbuild.c -@@ -3894,6 +3894,10 @@ entry_guard_register_connect_status(const char *digest, int succeeded, - int idx = -1; - char buf[HEX_DIGEST_LEN+1]; - -+ /* Ignore bridge reachability problems. */ -+ if (! succeeded) -+ return 0; -+ - if (! entry_guards) - return 0; -

1 0

[tor/master] add $(AM_V_GEN) to documentation generation Makefile targets.
by nickm＠torproject.org 02 Aug '12

02 Aug '12

commit c9aafa09627305e4aed5ef6871776b0b144ccff7 Author: Stewart Smith <stewart(a)flamingspork.com> Date: Thu Aug 2 10:05:36 2012 -0400 add $(AM_V_GEN) to documentation generation Makefile targets. This makes the V=1 or V=0 automake silent build options display (or hide) the full command line used. GEN foo.bar will be seen rather than the full command. As with all automake silent rules, "make V=1" will output the full command. --- doc/Makefile.am | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 6cdd66d..51a3b57 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -47,7 +47,7 @@ asciidoc_product = $(nodist_man_MANS) $(doc_DATA) # Generate the html documentation from asciidoc, but don't do # machine-specific replacements yet $(html_in) : - $(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@ + $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh html @ASCIIDOC@ $(top_srcdir)/doc/$@ tor.html.in : tor.1.txt torify.html.in : torify.1.txt @@ -58,7 +58,7 @@ tor-fw-helper.html.in : tor-fw-helper.1.txt # Generate the manpage from asciidoc, but don't do # machine-specific replacements yet $(man_in) : - $(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@ + $(AM_V_GEN)$(top_srcdir)/doc/asciidoc-helper.sh man @A2X@ $(top_srcdir)/doc/$@ tor.1.in : tor.1.txt torify.1.in : torify.1.txt @@ -69,10 +69,10 @@ tor-fw-helper.1.in : tor-fw-helper.1.txt # use ../config.status to swap all machine-specific magic strings # in the asciidoc with their replacements. $(asciidoc_product) : - if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \ + $(AM_V_GEN)if test -e $(top_srcdir)/doc/$@.in && ! test -e ./$@.in ; then \ cp $(top_srcdir)/doc/$@.in .; \ fi - ../config.status --file=$@; + $(AM_V_GEN)../config.status --file=$@; tor.1 : tor.1.in torify.1 : torify.1.in

1 0

[tor/master] Enable the automake silent rules.
by nickm＠torproject.org 02 Aug '12

02 Aug '12

commit 9572bebcda4dcd96eaef69e2e512cf31e18c5815 Author: Stewart Smith <stewart(a)flamingspork.com> Date: Thu Aug 2 10:01:25 2012 -0400 Enable the automake silent rules. $ make V=1 # will temporarily disable them otherwise you see: CC foo.c rather than the giant long bulid line. This makes it significantly easier to spot compiler warnings etc. Additionally, make them conditional, so we won't error on automake < 1.11 (commits squashed by nickm.) --- changes/tkt6522 | 5 +++++ configure.in | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/tkt6522 b/changes/tkt6522 new file mode 100644 index 0000000..5a8295a --- /dev/null +++ b/changes/tkt6522 @@ -0,0 +1,5 @@ + o Build changes: + - Where available, we now use automake's "silent" make rules by + default, so that warnings are easier to spot. You can get the + old behavior with "make V=1". Patch by Stewart Smith for ticket + 6522. diff --git a/configure.in b/configure.in index 148edd4..c107148 100644 --- a/configure.in +++ b/configure.in @@ -5,6 +5,7 @@ dnl See LICENSE for licensing information AC_INIT AM_INIT_AUTOMAKE(tor, 0.2.4.0-alpha-dev) +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST

1 0

r25740: {website} add the cloudflare mirror, update the list. (in website/trunk: . include)
by Andrew Lewman 02 Aug '12

02 Aug '12

Author: phobos Date: 2012-08-02 13:39:18 +0000 (Thu, 02 Aug 2012) New Revision: 25740 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: add the cloudflare mirror, update the list. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-08-02 06:16:07 UTC (rev 25739) +++ website/trunk/include/mirrors-table.wmi 2012-08-02 13:39:18 UTC (rev 25740) @@ -18,23 +18,6 @@ <tr> - <td>NL</td> - - <td>Amorphis</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>PT</td> <td>5ª Coluna</td> @@ -69,23 +52,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>EE</td> <td>CyberSIDE</td> @@ -188,6 +154,23 @@ <tr> + <td>DE</td> + + <td>torservers</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>myRL.net</td> @@ -630,15 +613,15 @@ <tr> - <td>SE</td> + <td>US</td> - <td>homosu</td> + <td></td> <td>Up to date</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><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> + <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,15 +630,15 @@ <tr> - <td>US</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> - <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></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> @@ -664,15 +647,15 @@ <tr> - <td>INT</td> + <td>NL</td> - <td>CoralCDN</td> + <td>Amorphis</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.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -681,11 +664,45 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</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> +</tr> + +<tr> + <td>US</td> <td>searchprivate</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> <td><a href="http://tor.searchprivate.com/dist/">http</a></td> @@ -732,23 +749,6 @@ <tr> - <td>DE</td> - - <td>torservers</td> - - <td>Out of date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IN</td> <td>India Tor Fans</td> @@ -817,6 +817,23 @@ <tr> + <td>INT</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://mirror.nametoday.me/tor/dist/">http</a></td> + <td><a href="http://mirror.nametoday.me/tor">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td></td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-08-02 06:16:07 UTC (rev 25739) +++ website/trunk/update-mirrors.pl 2012-08-02 13:39:18 UTC (rev 25740) @@ -1016,7 +1016,25 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", - } + }, + mirror070 => { + adminContact => "", + orgName => "", + isoCC => "INT", + subRegion => "", + region => "INT", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://mirror.nametoday.me/tor", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://mirror.nametoday.me/tor/dist/", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + } ); my $count = values %m;

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 02 Aug '12

02 Aug '12

commit 449976adfea2f376ae3a5687213392c212eb49e4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 2 10:45:22 2012 +0000 Update translations for vidalia_help_completed --- sv/links.po | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/sv/links.po b/sv/links.po new file mode 100644 index 0000000..c72e4dc --- /dev/null +++ b/sv/links.po @@ -0,0 +1,80 @@ +# +# Translators: +# <kanin(a)ersboda.nu>, 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-05-05 20:21+0200\n" +"PO-Revision-Date: 2012-08-02 10:40+0000\n" +"Last-Translator: youcanbeshiva <kanin(a)ersboda.nu>\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: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" + +#. type: Content of: <html><body><h1> +#: links.html:16 +msgid "Helpful Links" +msgstr "Hjälplänkar" + +#. type: Content of: <html><body><h3> +#: links.html:19 +msgid "Vidalia" +msgstr "Vidalia" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:22 links.html:30 links.html:42 links.html:49 links.html:57 +msgid "   " +msgstr "   " + +#. type: Content of: <html><body><table><tr><td> +#: links.html:23 links.html:43 +msgid "Homepage" +msgstr "Hemsida" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:25 +msgid "" +"<a href=\"https://www.torproject.org/vidalia/\"> " +"https://www.torproject.org/vidalia/</a>" +msgstr "<a href=\"https://www.torproject.org/vidalia/\"> https://www.torproject.org/vidalia/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:31 links.html:58 +msgid "Wiki and Bugtracker" +msgstr "Wiki och bugtracker" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:33 +msgid "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" +msgstr "<a href=\"http://trac.torproject.org/\"> http://trac.torproject.org/</a>" + +#. type: Content of: <html><body><h3> +#: links.html:39 +msgid "Tor" +msgstr "Tor" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:45 +msgid "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" +msgstr "<a href=\"https://www.torproject.org/\">https://www.torproject.org/</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:50 +msgid "FAQ" +msgstr "FAQ" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:52 +msgid "" +"<a href=\"https://www.torproject.org/docs/faq.html\"> " +"https://www.torproject.org/docs/faq.html</a>" +msgstr "<a href=\"https://www.torproject.org/docs/faq.html\"> https://www.torproject.org/docs/faq.html</a>" + +#. type: Content of: <html><body><table><tr><td> +#: links.html:60 +msgid "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>" +msgstr "<a href=\"https://trac.torproject.org/\"> https://trac.torproject.org/</a>"

1 0

← Newer
1
...
80
81
82
83
84
85
86
...
91
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2012