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

[metrics-tasks/master] Add --download option (#6329).
by karsten＠torproject.org 20 Jul '12

20 Jul '12

commit 00693abce05d177a388aa7adef6a2d371579e008 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 20 15:45:38 2012 +0200 Add --download option (#6329). --- task-6329/tor-relays-stats.py | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index 4fedf92..fc9b14c 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -11,6 +11,7 @@ import operator import sys import os.path from optparse import OptionParser, OptionGroup +import urllib class RelayStats(object): def __init__(self): @@ -129,8 +130,17 @@ class RelayStats(object): selection_weights[2] * 100.0, selection_weights[3] * 100.0, selection_weights[4] * 100.0) +def download_details_file(): + url = urllib.urlopen('https://onionoo.torproject.org/details?type=relay&running=true') + details_file = open("details.json", 'w') + details_file.write(url.read()) + url.close() + details_file.close() + if '__main__' == __name__: parser = OptionParser() + parser.add_option("-d", "--download", action="store_true", + help="download details.json from Onionoo service") group = OptionGroup(parser, "Filtering options") group.add_option("-a", "--as", dest="ases", action="append", help="select only relays from autonomous system number AS", @@ -155,8 +165,12 @@ if '__main__' == __name__: (options, args) = parser.parse_args() if len(args) > 0: parser.error("Did not understand positional argument(s), use options instead.") + + if options.download: + download_details_file() + if not os.path.exists('details.json'): - parser.error("Did not find details.json. Please download this file using the following command:\ncurl -o details.json 'https://onionoo.torproject.org/details?type=relay&running=true'") + parser.error("Did not find details.json. Re-run with --download.") stats = RelayStats() relays = stats.get_relays(countries=options.country,

1 0

[metrics-tasks/master] Accept "AS"-prefixed ASes or just AS numbers (#6329).
by karsten＠torproject.org 20 Jul '12

20 Jul '12

commit a0a2e0e0900832f78ce14d13fd5fa41417562717 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 20 15:48:20 2012 +0200 Accept "AS"-prefixed ASes or just AS numbers (#6329). --- task-6329/tor-relays-stats.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/task-6329/tor-relays-stats.py b/task-6329/tor-relays-stats.py index fc9b14c..09bf98a 100755 --- a/task-6329/tor-relays-stats.py +++ b/task-6329/tor-relays-stats.py @@ -27,6 +27,8 @@ class RelayStats(object): relays = [] if countries: countries = [x.lower() for x in countries] + if as_sets: + as_sets = [x if not x.isdigit() else "AS" + x for x in as_sets] for relay in self.data['relays']: if not relay['running']: continue

1 0

[metrics-tasks/master] Update README (#6329).
by karsten＠torproject.org 20 Jul '12

20 Jul '12

commit 0c7660b62ea92ef8ee4312ba5317dbf21d8a6a5a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 20 15:57:44 2012 +0200 Update README (#6329). --- task-6329/README | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/task-6329/README b/task-6329/README index 0c6c501..bbb36ae 100644 --- a/task-6329/README +++ b/task-6329/README @@ -7,29 +7,23 @@ based on the current consensus. Usage ----- -Usage: tor-relays-stats.py <output> [args ...] +Run the script with --help to learn about its usage: -Where <output> is one of: - - countries [COUNT] [FLAGS] - relative percentage of the consensus in each countries - - as-sets [COUNT] [FLAGS] [COUNTRIES] - relative percentage of the consensus in each AS sets - - relays [COUNT] [FLAGS] [COUNTRIES] [AS_SETS] - list relays ranked by their place in the whole consensus + ./tor-relays-stats.py -h Examples: - To get the top five exit nodes in France: - tor-relays-stats.py top 5 Exit fr + ./tor-relays-stats.py --top=5 --exits-only --country=fr - To get weights of the top ten AS of all relays in Germany: - tor-relays-stats.py as-sets 10 Running de + ./tor-relays-stats.py --top=10 --by-as --country=de Retrieving the data ------------------- This script expect to have a file called 'details.json' in the -current directory. In order to retrieve the needed data, one -can issue the following command: +current directory. Run with the --download option or issue the following +command to obtain that file: curl -o details.json 'https://onionoo.torproject.org/details?type=relay&running=true' @@ -38,10 +32,11 @@ Dependencies Written and tested on Python 2.6.6. -Author ------- +Authors +------- * delber <delber(a)riseup.net> + * Karsten Loesing <karsten(a)torproject.org> Licence -------

1 0

[tor/maint-0.2.3] changes file for bug 6436.
by nickm＠torproject.org 20 Jul '12

20 Jul '12

commit 6cf8e38eca78bfb5d4fd38733deb5b358ac4fdea Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 20 09:50:19 2012 -0400 changes file for bug 6436. --- changes/bug6436 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug6436 b/changes/bug6436 new file mode 100644 index 0000000..2c163df --- /dev/null +++ b/changes/bug6436 @@ -0,0 +1,3 @@ + o Minor features: + - Provide a better error message about possible OSX Asciidoc failure + reasons. Fix for bug 6436.

1 0

[tor/maint-0.2.3] Clarify how to build asciidoc files using homebrew on Mac OS X
by nickm＠torproject.org 20 Jul '12

20 Jul '12

commit 5b853612fbc928e9477b06095838e76f37bce6fc Author: Steven Murdoch <Steven.Murdoch(a)cl.cam.ac.uk> Date: Fri Jul 20 14:29:20 2012 +0100 Clarify how to build asciidoc files using homebrew on Mac OS X --- doc/asciidoc-helper.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 33e1360..dd420f7 100755 --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@ -54,7 +54,9 @@ You need a working asciidoc installed to be able to build the manpage. a2x is installed, but for some reason it isn't working. Sometimes This happens because required docbook support files are missing. Please install docbook-xsl, docbook-xml, and libxml2-utils (Debian) or -similar. +similar. If you use homebrew on Mac OS X, install the docbook formula +and add "export XML_CATALOG_FILES=/usr/local/etc/xml/catalog" to your +.bashrc Alternatively, to build without manpages, use the --disable-asciidoc argument when calling configure.

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 20 Jul '12

20 Jul '12

commit 5b3092eaec6644421a4fb9154b35aa2df5e66c27 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 20 12:45:10 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 6fa9224..8733f63 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.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:46+0000\n" -"PO-Revision-Date: 2012-07-20 07:47+0000\n" +"PO-Revision-Date: 2012-07-20 12:44+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2659,11 +2659,11 @@ msgstr "Tip:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Vekil sunucu türünü seçmelisiniz." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" @@ -3510,19 +3510,19 @@ msgstr "" msgctxt "StatusTab" msgid "Status" -msgstr "" +msgstr "Durum" msgctxt "StatusTab" msgid "Message Log" -msgstr "" +msgstr "Mesaj Günlüğü" msgctxt "StatusTab" msgid "Tor Status" -msgstr "" +msgstr "Tor Durumu" msgctxt "StatusTab" msgid "Show on startup" -msgstr "" +msgstr "Başlangıçta göster" msgctxt "Stream" msgid "New" @@ -3564,7 +3564,7 @@ msgctxt "TorControl" msgid "" "Vidalia has not started Tor. You need to stop Tor through the interface you " "started it." -msgstr "" +msgstr "Vidalia Tor 'u başlatmadı. Tor başlattığınız arayüzü kullanarak durdurmalısınız." msgctxt "TorControl" msgid "Start failed: %1" @@ -3600,63 +3600,63 @@ msgstr "Kontrol şifresinin hash kodunda hata oluştu." msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "Torrc düzenleniyor" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "Kes" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "Kopyala" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "Yapıştır" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "Geri Al" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "Yeniden Yap" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "Hepsini Seç" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "Hata" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "Torrc dosyasını açarken bir hata oluştu." msgctxt "TorrcDialog" msgid "Ctrl+X" -msgstr "" +msgstr "Ctrl+X" msgctxt "TorrcDialog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "TorrcDialog" msgid "Ctrl+V" -msgstr "" +msgstr "Ctrl+V" msgctxt "TorrcDialog" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "TorrcDialog" msgid "Ctrl+Shift+Z" -msgstr "" +msgstr "Ctrl+Shift+Z" msgctxt "TorrcDialog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "UPNPControl" msgid "Success"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 20 Jul '12

20 Jul '12

commit 1400cf45bb440d98d8babead30df480dfc3dcb95 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 20 08:15:14 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index f387bef..6fa9224 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.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:46+0000\n" -"PO-Revision-Date: 2012-07-20 05:58+0000\n" +"PO-Revision-Date: 2012-07-20 07:47+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2001,7 +2001,7 @@ msgstr "Ayarları yeniden yüklerken hata oluştu" msgctxt "MainWindow" msgid "Vidalia was unable to reload Tor's configuration." -msgstr "" +msgstr "Vidalia Tor ayarlarını yeniden yükleyemedi." msgctxt "MainWindow" msgid "No dettached tabs" @@ -2354,7 +2354,7 @@ msgstr "Yeni günlük mesajlarını otomatik kaydet" msgctxt "MessageLog" msgid "toolbar" -msgstr "" +msgstr "Araç Çubuğu" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2501,19 +2501,19 @@ msgstr "Ctrl+F" msgctxt "NetViewer" msgid "Network Map" -msgstr "" +msgstr "Ağ Haritası" msgctxt "NetViewer" msgid "Relay" -msgstr "" +msgstr "Anahtarlama" msgctxt "NetViewer" msgid "Connection" -msgstr "" +msgstr "Bağlantı" msgctxt "NetViewer" msgid "Status" -msgstr "" +msgstr "Durum" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" @@ -2651,11 +2651,11 @@ msgstr "Yeni köprü bulmanın diğer yöntemlerini görmek için Yardım'a tık msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adres:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Tip:" msgctxt "NetworkPage" msgid "You must select the proxy type."

1 0

[onionoo/master] Add path selection probabilities to details files.
by karsten＠torproject.org 20 Jul '12

20 Jul '12

commit 86fae9e607668a1768041ac6cf19ee0b41cb7aea Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jul 19 22:32:28 2012 +0200 Add path selection probabilities to details files. --- src/org/torproject/onionoo/CurrentNodes.java | 7 + src/org/torproject/onionoo/DetailDataWriter.java | 137 ++++++++++++++++++++++ src/org/torproject/onionoo/Main.java | 1 + src/org/torproject/onionoo/Node.java | 36 ++++++ web/index.html | 48 ++++++++ 5 files changed, 229 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/onionoo/CurrentNodes.java b/src/org/torproject/onionoo/CurrentNodes.java index 7c4bec8..7ef1473 100644 --- a/src/org/torproject/onionoo/CurrentNodes.java +++ b/src/org/torproject/onionoo/CurrentNodes.java @@ -250,6 +250,10 @@ public class CurrentNodes { } } + SortedMap<String, Integer> lastBandwidthWeights = null; + public SortedMap<String, Integer> getLastBandwidthWeights() { + return this.lastBandwidthWeights; + } private void updateRelayNetworkStatusConsensus( RelayNetworkStatusConsensus consensus) { long validAfterMillis = consensus.getValidAfterMillis(); @@ -268,6 +272,9 @@ public class CurrentNodes { null, validAfterMillis, orPort, dirPort, relayFlags, consensusWeight, null, null, -1L); } + if (this.lastValidAfterMillis == validAfterMillis) { + this.lastBandwidthWeights = consensus.getBandwidthWeights(); + } } public void addRelay(String nickname, String fingerprint, diff --git a/src/org/torproject/onionoo/DetailDataWriter.java b/src/org/torproject/onionoo/DetailDataWriter.java index 155c4eb..2961de9 100644 --- a/src/org/torproject/onionoo/DetailDataWriter.java +++ b/src/org/torproject/onionoo/DetailDataWriter.java @@ -13,6 +13,7 @@ import java.net.UnknownHostException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -194,6 +195,115 @@ public class DetailDataWriter { } } + public void calculatePathSelectionProbabilities( + SortedMap<String, Integer> bandwidthWeights) { + boolean consensusContainsBandwidthWeights = false; + double wgg = 0.0, wgd = 0.0, wmg = 0.0, wmm = 0.0, wme = 0.0, + wmd = 0.0, wee = 0.0, wed = 0.0; + if (bandwidthWeights != null) { + SortedSet<String> weightKeys = new TreeSet<String>(Arrays.asList( + "Wgg,Wgd,Wmg,Wmm,Wme,Wmd,Wee,Wed".split(","))); + weightKeys.removeAll(bandwidthWeights.keySet()); + if (weightKeys.isEmpty()) { + consensusContainsBandwidthWeights = true; + wgg = ((double) bandwidthWeights.get("Wgg")) / 10000.0; + wgd = ((double) bandwidthWeights.get("Wgd")) / 10000.0; + wmg = ((double) bandwidthWeights.get("Wmg")) / 10000.0; + wmm = ((double) bandwidthWeights.get("Wmm")) / 10000.0; + wme = ((double) bandwidthWeights.get("Wme")) / 10000.0; + wmd = ((double) bandwidthWeights.get("Wmd")) / 10000.0; + wee = ((double) bandwidthWeights.get("Wee")) / 10000.0; + wed = ((double) bandwidthWeights.get("Wed")) / 10000.0; + } + } + SortedMap<String, Double> + advertisedBandwidths = new TreeMap<String, Double>(), + consensusWeights = new TreeMap<String, Double>(), + guardWeights = new TreeMap<String, Double>(), + middleWeights = new TreeMap<String, Double>(), + exitWeights = new TreeMap<String, Double>(); + double totalAdvertisedBandwidth = 0.0; + double totalConsensusWeight = 0.0; + double totalGuardWeight = 0.0; + double totalMiddleWeight = 0.0; + double totalExitWeight = 0.0; + for (Map.Entry<String, Node> e : this.relays.entrySet()) { + String fingerprint = e.getKey(); + Node relay = e.getValue(); + if (!relay.getRunning()) { + continue; + } + boolean isExit = relay.getRelayFlags().contains("Exit") && + !relay.getRelayFlags().contains("BadExit"); + boolean isGuard = relay.getRelayFlags().contains("Guard"); + if (this.relayServerDescriptors.containsKey(fingerprint)) { + ServerDescriptor serverDescriptor = + this.relayServerDescriptors.get(fingerprint); + double advertisedBandwidth = (double) Math.min(Math.min( + serverDescriptor.getBandwidthBurst(), + serverDescriptor.getBandwidthObserved()), + serverDescriptor.getBandwidthRate()); + advertisedBandwidths.put(fingerprint, advertisedBandwidth); + totalAdvertisedBandwidth += advertisedBandwidth; + } + double consensusWeight = (double) relay.getConsensusWeight(); + consensusWeights.put(fingerprint, consensusWeight); + totalConsensusWeight += consensusWeight; + if (consensusContainsBandwidthWeights) { + double guardWeight = consensusWeight, + middleWeight = consensusWeight, + exitWeight = consensusWeight; + if (isGuard && isExit) { + guardWeight *= wgd; + middleWeight *= wmd; + exitWeight *= wed; + } else if (isGuard) { + guardWeight *= wgg; + middleWeight *= wmg; + exitWeight = 0.0; + } else if (isExit) { + guardWeight = 0.0; + middleWeight *= wme; + exitWeight *= wee; + } else { + guardWeight = 0.0; + middleWeight *= wmm; + exitWeight = 0.0; + } + guardWeights.put(fingerprint, guardWeight); + middleWeights.put(fingerprint, middleWeight); + exitWeights.put(fingerprint, exitWeight); + totalGuardWeight += guardWeight; + totalMiddleWeight += middleWeight; + totalExitWeight += exitWeight; + } + } + for (Map.Entry<String, Node> e : this.relays.entrySet()) { + String fingerprint = e.getKey(); + Node relay = e.getValue(); + if (advertisedBandwidths.containsKey(fingerprint)) { + relay.setAdvertisedBandwidthFraction(advertisedBandwidths.get( + fingerprint) / totalAdvertisedBandwidth); + } + if (consensusWeights.containsKey(fingerprint)) { + relay.setConsensusWeightFraction(consensusWeights.get(fingerprint) + / totalConsensusWeight); + } + if (guardWeights.containsKey(fingerprint)) { + relay.setGuardProbability(guardWeights.get(fingerprint) + / totalGuardWeight); + } + if (middleWeights.containsKey(fingerprint)) { + relay.setMiddleProbability(middleWeights.get(fingerprint) + / totalMiddleWeight); + } + if (exitWeights.containsKey(fingerprint)) { + relay.setExitProbability(exitWeights.get(fingerprint) + / totalExitWeight); + } + } + } + private long now = System.currentTimeMillis(); private Map<String, Set<ExitListEntry>> exitListEntries = new HashMap<String, Set<ExitListEntry>>(); @@ -444,6 +554,12 @@ public class DetailDataWriter { String aSName = entry.getASName(); long consensusWeight = entry.getConsensusWeight(); String hostName = entry.getHostName(); + double advertisedBandwidthFraction = + entry.getAdvertisedBandwidthFraction(); + double consensusWeightFraction = entry.getConsensusWeightFraction(); + double guardProbability = entry.getGuardProbability(); + double middleProbability = entry.getMiddleProbability(); + double exitProbability = entry.getExitProbability(); StringBuilder sb = new StringBuilder(); sb.append("{\"version\":1,\n" + "\"nickname\":\"" + nickname + "\",\n" @@ -501,6 +617,27 @@ public class DetailDataWriter { sb.append(",\n\"host_name\":\"" + escapeJSON(hostName) + "\""); } + if (advertisedBandwidthFraction >= 0.0) { + sb.append(String.format( + ",\n\"advertised_bandwidth_fraction\":%.9f", + advertisedBandwidthFraction)); + } + if (consensusWeightFraction >= 0.0) { + sb.append(String.format(",\n\"consensus_weight_fraction\":%.9f", + consensusWeightFraction)); + } + if (guardProbability >= 0.0) { + sb.append(String.format(",\n\"guard_probability\":%.9f", + guardProbability)); + } + if (middleProbability >= 0.0) { + sb.append(String.format(",\n\"middle_probability\":%.9f", + middleProbability)); + } + if (exitProbability >= 0.0) { + sb.append(String.format(",\n\"exit_probability\":%.9f", + exitProbability)); + } /* Add exit addresses if at least one of them is distinct from the * onion-routing addresses. */ diff --git a/src/org/torproject/onionoo/Main.java b/src/org/torproject/onionoo/Main.java index 5cac8de..175176c 100644 --- a/src/org/torproject/onionoo/Main.java +++ b/src/org/torproject/onionoo/Main.java @@ -24,6 +24,7 @@ public class Main { ddw.setCurrentBridges(cn.getCurrentBridges()); ddw.startReverseDomainNameLookups(); ddw.readRelayServerDescriptors(); + ddw.calculatePathSelectionProbabilities(cn.getLastBandwidthWeights()); ddw.readExitLists(); ddw.readBridgeServerDescriptors(); ddw.readBridgePoolAssignments(); diff --git a/src/org/torproject/onionoo/Node.java b/src/org/torproject/onionoo/Node.java index 88ca71c..61a26ed 100644 --- a/src/org/torproject/onionoo/Node.java +++ b/src/org/torproject/onionoo/Node.java @@ -35,6 +35,11 @@ public class Node { private boolean running; private String hostName; private long lastRdnsLookup = -1L; + private double advertisedBandwidthFraction = -1.0; + private double consensusWeightFraction = -1.0; + private double guardProbability = -1.0; + private double middleProbability = -1.0; + private double exitProbability = -1.0; public Node(String nickname, String fingerprint, String address, SortedSet<String> orAddressesAndPorts, SortedSet<String> exitAddresses, long lastSeenMillis, int orPort, @@ -194,5 +199,36 @@ public class Node { public long getLastRdnsLookup() { return this.lastRdnsLookup; } + public void setAdvertisedBandwidthFraction( + double advertisedBandwidthFraction) { + this.advertisedBandwidthFraction = advertisedBandwidthFraction; + } + public double getAdvertisedBandwidthFraction() { + return this.advertisedBandwidthFraction; + } + public void setConsensusWeightFraction(double consensusWeightFraction) { + this.consensusWeightFraction = consensusWeightFraction; + } + public double getConsensusWeightFraction() { + return this.consensusWeightFraction; + } + public void setGuardProbability(double guardProbability) { + this.guardProbability = guardProbability; + } + public double getGuardProbability() { + return this.guardProbability; + } + public void setMiddleProbability(double middleProbability) { + this.middleProbability = middleProbability; + } + public double getMiddleProbability() { + return this.middleProbability; + } + public void setExitProbability(double exitProbability) { + this.exitProbability = exitProbability; + } + public double getExitProbability() { + return this.exitProbability; + } } diff --git a/web/index.html b/web/index.html index 5788bf9..0578843 100755 --- a/web/index.html +++ b/web/index.html @@ -276,6 +276,54 @@ same family as this relay. Optional field. Omitted if empty or if descriptor containing this information cannot be found.</li> +<li>"advertised_bandwidth_fraction": +Relative advertised bandwidth of this relay compared to the total +advertised bandwidth in the network. +If there were no bandwidth authorities, this fraction would be a very +rough approximation of the probability of this relay to be selected by +clients. +Optional field. +Omitted if the relay is not running, or router descriptor containing this +information cannot be found. +Added field on July 19, 2012.</li> +<li>"consensus_weight_fraction": +Fraction of this relay's consensus weight compared to the sum of all +consensus weights in the network. +This fraction is a very rough approximation of the probability of this +relay to be selected by clients. +Optional field. +Omitted if the relay is not running. +Added field on July 19, 2012.</li> +<li>"guard_probability": +Probability of this relay to be selected for the guard position. +This probability is calculated based on consensus weights, relay flags, +and bandwidth weights in the consensus. +Path selection depends on more factors, so that this probability can only +be an approximation. +Optional field. +Omitted if the relay is not running, or the consensus does not contain +bandwidth weights. +Added field on July 19, 2012.</li> +<li>"middle_probability": +Probability of this relay to be selected for the middle position. +This probability is calculated based on consensus weights, relay flags, +and bandwidth weights in the consensus. +Path selection depends on more factors, so that this probability can only +be an approximation. +Optional field. +Omitted if the relay is not running, or the consensus does not contain +bandwidth weights. +Added field on July 19, 2012.</li> +<li>"exit_probability": +Probability of this relay to be selected for the exit position. +This probability is calculated based on consensus weights, relay flags, +and bandwidth weights in the consensus. +Path selection depends on more factors, so that this probability can only +be an approximation. +Optional field. +Omitted if the relay is not running, or the consensus does not contain +bandwidth weights. +Added field on July 19, 2012.</li> </ul> </li> <li>"bridges_published": UTC timestamp (YYYY-MM-DD hh:mm:ss) when

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 20 Jul '12

20 Jul '12

commit acbcf0071f4d436c9d1c5a37425a7882e9e70e2b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 20 06:15:10 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 3eafd48..f387bef 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.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:46+0000\n" -"PO-Revision-Date: 2012-07-19 09:10+0000\n" +"PO-Revision-Date: 2012-07-20 05:58+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1997,7 +1997,7 @@ msgstr "Vidalia Tor 'u yeniden başlatmayı denedi, ancak başaramadı. Lütfen msgctxt "MainWindow" msgid "Error reloading configuration" -msgstr "" +msgstr "Ayarları yeniden yüklerken hata oluştu" msgctxt "MainWindow" msgid "Vidalia was unable to reload Tor's configuration."

1 0

[tor/master] Don't put unreachable IPv6 OR port in routerstatus.
by nickm＠torproject.org 19 Jul '12

19 Jul '12

commit 6d99c51f15d664ff6b33957b1043c73448a72711 Author: Linus Nordberg <linus(a)nordberg.se> Date: Thu May 10 17:08:22 2012 +0200 Don't put unreachable IPv6 OR port in routerstatus. To have only reachable ports in "a" lines. --- src/or/dirserv.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 2af4e68..abbc123 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2468,8 +2468,14 @@ set_routerstatus_from_routerinfo(routerstatus_t *rs, strlcpy(rs->nickname, ri->nickname, sizeof(rs->nickname)); rs->or_port = ri->or_port; rs->dir_port = ri->dir_port; - tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); - rs->ipv6_orport = ri->ipv6_orport; + if (!tor_addr_is_null(&ri->ipv6_addr) && + node->last_reachable6 >= now - REACHABLE_TIMEOUT) { + /* There's an IPv6 OR port and it's reachable so copy it to the + routerstatus. FIXME: If we're not on IPv6, copy it regardless + of reachability. */ + tor_addr_copy(&rs->ipv6_addr, &ri->ipv6_addr); + rs->ipv6_orport = ri->ipv6_orport; + } } /** Routerstatus rs is part of a group of routers that are on

1 0