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

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Jul '14

09 Jul '14

commit 0920a3b54821cecaf6ff206a5f8aa59810a468fc Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 9 16:45:17 2014 +0000 Update translations for liveusb-creator --- ko/ko.po | 7 ++++--- pt/pt.po | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ko/ko.po b/ko/ko.po index 9a71408..d25ae0c 100644 --- a/ko/ko.po +++ b/ko/ko.po @@ -4,6 +4,7 @@ # # Translators: # ilbe123 <a3057016(a)drdrb.net>, 2014 +# testsubject67 <deborinha97(a)hotmail.com>, 2014 # eukim <eukim(a)redhat.com>, 2009 # Dr.what <javrick6(a)naver.com>, 2014 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:56+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-09 16:40+0000\n" +"Last-Translator: testsubject67 <deborinha97(a)hotmail.com>\n" "Language-Team: Korean (http://www.transifex.com/projects/p/torproject/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +53,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n" "Need help? Read the <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a>.</body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n\np, li { white-space: pre-wrap; }\n\n</style></head><body style=\" font-family:'Sans Serif'; font-size:11pt; font-weight:400; font-style:normal;\">\n\n도움 필요하세요? <a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\">documentation</a> 를읽어보세요.</body></html>" #: ../liveusb/launcher_ui.py:151 msgid "" diff --git a/pt/pt.po b/pt/pt.po index 90eacfa..d305069 100644 --- a/pt/pt.po +++ b/pt/pt.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# testsubject67 <deborinha97(a)hotmail.com>, 2014 # Francisco P. <sonhosdigitais(a)gmx.com>, 2013 # Koh Pyreit <kohpyreit(a)gmail.com>, 2013 # Tiago Filipe Rocha <rocha.t80(a)gmail.com>, 2014 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-07-01 22:11+0200\n" -"PO-Revision-Date: 2014-07-02 08:56+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-09 16:31+0000\n" +"Last-Translator: testsubject67 <deborinha97(a)hotmail.com>\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/torproject/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -502,7 +503,7 @@ msgstr "Sistema de ficheiros não suportado: %s\nPor favor, faça um backup e fo #: ../liveusb/creator.py:882 #, python-format msgid "Updating properties of system partition %(system_partition)s" -msgstr "" +msgstr "Fazendo update das propriedades de deivisão de sistema %(system_partition)s" #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO"

1 0

[tor-browser-spec/master] Describe build reproducibility.
by mikeperry＠torproject.org 09 Jul '14

09 Jul '14

commit 9ae0e841c99c85f30d5c3fce6742332be84b4c5d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 21 15:14:00 2014 -0700 Describe build reproducibility. --- design-doc/design.xml | 260 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 244 insertions(+), 16 deletions(-) diff --git a/design-doc/design.xml b/design-doc/design.xml index d1cdf0f..dde142f 100644 --- a/design-doc/design.xml +++ b/design-doc/design.xml @@ -37,10 +37,10 @@ This document describes the <link linkend="adversary">adversary model</link>, <link linkend="DesignRequirements">design requirements</link>, and <link -linkend="Implementation">implementation</link>  of the Tor Browser. It is current as of Tor Browser -2.3.25-5 and Torbutton 1.5.1. +3.6.2. </para> <para> @@ -2296,24 +2296,253 @@ with dual Flash+HTML5 video players, such as YouTube. - Update security - Thandy -<sect1 id="Packaging"> - <title>Packaging</title> - <para> </para> - <sect2 id="build-security"> - <title>Build Process Security</title> - <para> </para> +--> + +<sect1 id="BuildSecurity"> + <title>Build Security and Package Integrity</title> + <para> + +In the age of state-sponsored malware, <ulink +url="https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and…">we +believe</ulink> it is impossible to expect to keep a single build machine or +software signing key secure, given the class of adversaries that Tor has to +contend with. For this reason, we have deployed a build system +that allows anyone to use our source code to reproduce byte-for-byte identical +binary packages to the ones that we distribute. + + </para> + + <sect2> + <title>Achieving Binary Reproducibility</title> + <para> + +The GNU toolchain has been working on providing reproducible builds for some +time, however a large software project such as Firefox typically ends up +embedding a large number of details about the machine it was built on, both +intentionally and inadvertently. Additionally, manual changes to the build +machine configuration can accumulate over time and are difficult for others to +replicate externally, which leads to difficulties with binary reproducibility. + + </para> + + <para> +For this reason, we decided to leverage the work done by the <ulink +url="http://gitian.org/">Gitian Project</ulink> from the Bitcoin community. +Gitian is a wrapper around Ubuntu's virtualization tools that allows you to +specify an Ubuntu version, architecture, a set of additional packages, a set +of input files, and a bash build scriptlet in an YAML document called a +"Gitian Descriptor". This document is used to install a qemu-kvm image, and +execute your build scriptlet inside it. + </para> + + <para> + +We have created a <ulink +url="https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/refs/hea…">set +of wrapper scripts</ulink> around Gitian to automate dependency download and +authentication, as well as transfer intermediate build outputs between the +stages of the build process. Because Gitian creates an Ubuntu build +environment, we must use cross-compilation to create packages for Windows and +Mac OS. For Windows, we use mingw-w64 as our cross compiler. For Mac OS, we +use toolchain4 in combination with a binary redistribution of the Mac OS 10.6 +SDK. + + </para> + + <para> + +The use of the Gitian system eliminates build non-determinism by normalizing +the build environment's hostname, username, build path, uname output, +toolchain versions, and time. On top of what Gitian provides, we also had to +address the following additional sources of non-determinism: + + </para> + + <orderedlist> + <listitem>Filesystem and archive reordering + <para> + +The most prevalent source of non-determinism in the components of Tor Browser +by far was various ways that archives (such as zip, tar, jar/ja, DMG, and +Firefox manifest lists) could be reordered. Many file archivers walk the +filesystem in inode structure order by default, which will result in ordering +differences between two different archive invocations, especially on machines +of different disk and hardware configurations. + + </para> + <para> + +The fix for this is to perform an additional sorting step on the input list +for archives, but care must be taken to instruct libc and other sorting routines +to use a fixed locale to determine lexicographic ordering, or machines with +different locale settings will produce different sort results. We chose the +'C' locale for this purpose. We created wrapper scripts for <ulink +url="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">tar</ulink>, +<ulink +url="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">zip</ulink>, +and <ulink +url="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">DMG</ulink> +to aid in reproducible archive creation. + + </para> + </listitem> + + <listitem>Uninitialized memory in toolchain/archivers + <para> + +We ran into difficulties with both binutils and the DMG archive script using +uninitialized memory in certain data structures that ended up written to disk. +Our binutils fixes were merged upstream, but the DMG archive fix remains an +<ulink +url="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">independent +patch</ulink>. + + </para> + </listitem> + <listitem>Fine-grained timestamps and timezone leaks + <para> + +The standard way of controlling timestamps in Gitian is to use libfaketime, +which hooks time-related library calls to provide a fixed timestamp. However, +libfaketime does not spoof the millisecond and microsecond components of +timestamps, which found their way into pyc files and also in explicit Firefox +build process timestamp embedding. + </para> + <para> + +We addressed the Firefox issues with direct patches to their build process, +which have since been merged. However, pyc timestamps had to be address with +an additional <ulink +url="https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/HEAD:/gi…">helper +script</ulink>. + </para> + <para> + +The timezone leaks were addressed by setting the <command>TZ</command> +environment variable to UTC in our descriptors. + + </para> + </listitem> + <listitem>Deliberately generated entropy + <para> + +In two circumstances, deliberately generated entropy was introduced in various +components of the build process. First, the BuildID Debuginfo identifier +(which associates detached debug files with their corresponding stripped +executables) was introducing entropy from some unknown source. We removed this +header using objcopy invocations in our build scriptlets, and opted to use GNU +DebugLink instead of BuildID for this association. + + </para> + <para> + +Second, on Linux, Firefox builds detached signatures of its cryptographic +libraries using a temporary key for FIPS-140 certification. A rather insane +subsection of the FIPS-140 certification standard requires that you distribute +signatures for all of your cryptographic libraries. The Firefox build process +meets this requirement by generating a temporary key, using it to sign the +libraries, and discarding the private portion of that key. Because there are +many other ways to intercept the crypto outside of modifying the actual DLL +images, we opted to simply remove these signature files from distribution. +There simply is no way to verify code integrity on a running system without +both OS and coprocessor assistance. Download package signatures make sense of +course, but we handle those another way (as mentioned above). + + + </para> + </listitem> + <listitem>LXC-specific leaks + <para> + +Gitian provides an option to use LXC containers instead of full qemu-kvm +virtualization. Unfortunately, these containers can allow additional details +about the host OS to leak. In particular, umask settings as well as the +hostname and Linux kernel version can leak from the host OS into the LXC +container. We addressed umask by setting it explicitly in our Gitian +descriptor scriptlet, and addressed the hostname and kernel version leaks by +directly patching the aspects of the Firefox build process that included this +information into the build. + </para> + </listitem> + </orderedlist> </sect2> - <sect2 id="addons"> - <title>External Addons</title> + + <sect2> + <title>Package Signatures and Verification</title> + <para> + +The build process produces a single sha256sums.txt file that contains a sorted +list the SHA-256 hashes of every package produced for that build version. Each +official builder uploads this file and a GPG signature of it to a directory +on a Tor Project's web server. The build scripts have an optional matching +step that downloads these signatures, verifies them, and ensures that the +local builds match this file. + + </para> + <para> + +When builds are published officially, the single sha256sums.txt file is +accompanied by a detached GPG signature from each official builder that +produced a matching build. The packages are additionally signed with detached +GPG signatures from an official signing key. + + </para> + <para> + +The fact that the entire set of packages for a given version can be +authenticated by a single hash of the sha256sums.txt file will also allow us +to create a number of auxiliary authentication mechanisms for our packages, +beyond just trusting a single offline build machine and a single cryptographic +key's integrity. Interesting examples include providing multiple independent +cryptographic signatures for packages, listing the package hashes in the Tor +consensus, and encoding the package hashes in the Bitcoin blockchain. + + </para> + <para> + +At the time of this writing, we do not yet support native code signing for Mac +OS or Windows. Because these signatures are embedded in the actual packages, +and by their nature are based on non-public key material, providing native +code-signed packages while still preserving ease of reproducibility +verification has not yet been achieved. + + </para> + </sect2> + + <sect2> + <title>Anonymous Verification</title> + <para> + +Due to the fact that bit-identical packages can be produced by anyone, the +security of this build system extends beyond the security of the official +build machines. In fact, it is still possible for build integrity to be +achieved even if all official build machines are compromised. + + </para> + <para> + +By default, all tor-specific dependencies and inputs to the build process are +downloaded over Tor, which allows build verifiers to remain anonymous and +hidden. Because of this, any individual can use our anonymity network to +privately download our source code, verify it against public signed, audited, +and mirrored git repositories, and reproduce our builds exactly, without being +subject to targeted attacks. If they notice any differences, they can alert +the public builders/signers, hopefully using a pseudonym or our anonymous +bugtracker account, to avoid revealing the fact that they are a build +verifier. + + </para> + </sect2> +</sect1> + -<!-- + <sect1 id="Testing"> <title>Testing</title> <para>

1 0

[tor/maint-0.2.5] Remove executable bit from control.c, router.c
by nickm＠torproject.org 09 Jul '14

09 Jul '14

commit 35791f4238bd6853c038d5fc68976dd74c93c577 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 9 08:54:08 2014 -0400 Remove executable bit from control.c, router.c Fix for 12512. --- 0 files changed diff --git a/src/or/control.c b/src/or/control.c old mode 100755 new mode 100644 diff --git a/src/or/router.c b/src/or/router.c old mode 100755 new mode 100644

1 0

[onionoo/master] Correct specification of as_number.
by karsten＠torproject.org 09 Jul '14

09 Jul '14

commit 5b65ca01402e5ed926a0eeba980238937a699f2f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 9 11:33:08 2014 +0200 Correct specification of as_number. --- web/protocol.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/protocol.html b/web/protocol.html index 2d51621..0af4562 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -881,11 +881,12 @@ database. <li> as_number -<code class="typeof">number</code> +<code class="typeof">string</code> optional AS number as found in an AS database by resolving the relay's first onion-routing IP address. +AS number strings start with "AS", followed directly by the AS number. Omitted if the relay IP address could not be found in the AS database.

1 0

[onionoo/master] Don't compress weights values with missing values.
by karsten＠torproject.org 09 Jul '14

09 Jul '14

commit 78a7a626aa135d9cd7414e7610b4713a67b83266 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 15 10:37:30 2014 +0200 Don't compress weights values with missing values. When compressing weights status lines, we simply combined adjacent intervals by calculating arithmetic means. But we did not consider missing values, which were encoded as 0.0. As a result the result was lower than it should really have been. Now that missing values are encoded as -1.0, it becomes even more apparent that this approach was wrong with negative weights values of, e.g., -0.127320915201. As a fix, avoid compressing intervals with missing values for certain weights. Example of an old combined line: 2008-08-20 20:00:00 2008-08-29 00:00:00 0.000261225507 -0.127320915201 -1.000000000000 -1.000000000000 -1.000000000000 76374.857142857120 65.306122448979 The -0.127320915201 part is wrong there. Example of the same data, not combined: 2008-08-20 20:00:00 2008-08-21 21:00:00 0.000245451671 -1.000000000000 -1.000000000000 -1.000000000000 -1.000000000000 73466.880000000000 -1.000000000000 2008-08-21 21:00:00 2008-08-29 00:00:00 0.000263531623 0.000263746320 -1.000000000000 -1.000000000000 -1.000000000000 76800.000000000000 75.000000000000 Found in the context of implementing #11388. --- src/org/torproject/onionoo/WeightsStatusUpdater.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/onionoo/WeightsStatusUpdater.java b/src/org/torproject/onionoo/WeightsStatusUpdater.java index 24c98ff..5932da6 100644 --- a/src/org/torproject/onionoo/WeightsStatusUpdater.java +++ b/src/org/torproject/onionoo/WeightsStatusUpdater.java @@ -257,6 +257,7 @@ public class WeightsStatusUpdater implements DescriptorListener, long lastStartMillis = 0L, lastEndMillis = 0L; double[] lastWeights = null; String lastMonthString = "1970-01"; + int lastMissingValues = -1; for (Map.Entry<long[], double[]> e : history.entrySet()) { long startMillis = e.getKey()[0], endMillis = e.getKey()[1]; double[] weights = e.getValue(); @@ -277,10 +278,17 @@ public class WeightsStatusUpdater implements DescriptorListener, } String monthString = DateTimeHelper.format(startMillis, DateTimeHelper.ISO_YEARMONTH_FORMAT); + int missingValues = 0; + for (int i = 0; i < weights.length; i++) { + if (weights[i] < -0.5) { + missingValues += 1 << i; + } + } if (lastEndMillis == startMillis && ((lastEndMillis - 1L) / intervalLengthMillis) == ((endMillis - 1L) / intervalLengthMillis) && - lastMonthString.equals(monthString)) { + lastMonthString.equals(monthString) && + lastMissingValues == missingValues) { double lastIntervalInHours = (double) ((lastEndMillis - lastStartMillis) / DateTimeHelper.ONE_HOUR); double currentIntervalInHours = (double) ((endMillis @@ -303,6 +311,7 @@ public class WeightsStatusUpdater implements DescriptorListener, lastWeights = weights; } lastMonthString = monthString; + lastMissingValues = missingValues; } if (lastStartMillis > 0L) { compressedHistory.put(new long[] { lastStartMillis, lastEndMillis },

1 0

[onionoo/master] Add advertised_bandwidth and consensus_weight graphs.
by karsten＠torproject.org 09 Jul '14

09 Jul '14

commit 99e841366e9f56489915cd886367ccfaf3dfdc64 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Jun 8 19:56:26 2014 +0200 Add advertised_bandwidth and consensus_weight graphs. Weights documents contain advertised_bandwidth_fraction and consensus_weight_fraction graphs containing, well, fractions of the relay's value compared to the network total. This commit adds two new graphs showing the respective absolute values, to distinguish effects of things happening on a relay from those happening to the overall Tor network. This change further allows us to spot changes to a relays' absolute values over time, like relays increasing their advertised bandwidth by more than 128 KB/s. Also fixed a few things while re-processing the archives: - Older consensuses contained non-"Running" relays, which caused a NullPointerException. - Older consensuses did not contain "w" lines and/or no bandwidth weights, either of which we didn't handle very well. - Whenever we didn't find a server descriptor we silently assumed that advertised bandwidth is 0. Now we're handling this as missing data and not including intervals in advertised_bandwidth_fraction and the new advertised_bandwidth. Implements #11388. --- src/org/torproject/onionoo/WeightsDocument.java | 12 ++ .../torproject/onionoo/WeightsDocumentWriter.java | 12 +- src/org/torproject/onionoo/WeightsStatus.java | 8 +- .../torproject/onionoo/WeightsStatusUpdater.java | 118 ++++++++++++-------- web/protocol.html | 24 ++++ 5 files changed, 124 insertions(+), 50 deletions(-) diff --git a/src/org/torproject/onionoo/WeightsDocument.java b/src/org/torproject/onionoo/WeightsDocument.java index ff1d5f4..6dddf9d 100644 --- a/src/org/torproject/onionoo/WeightsDocument.java +++ b/src/org/torproject/onionoo/WeightsDocument.java @@ -40,5 +40,17 @@ class WeightsDocument extends Document { Map<String, GraphHistory> exitProbability) { this.exit_probability = exitProbability; } + + private Map<String, GraphHistory> advertised_bandwidth; + public void setAdvertisedBandwidth( + Map<String, GraphHistory> advertisedBandwidth) { + this.advertised_bandwidth = advertisedBandwidth; + } + + private Map<String, GraphHistory> consensus_weight; + public void setConsensusWeight( + Map<String, GraphHistory> consensusWeight) { + this.consensus_weight = consensusWeight; + } } diff --git a/src/org/torproject/onionoo/WeightsDocumentWriter.java b/src/org/torproject/onionoo/WeightsDocumentWriter.java index 74108c9..2e0d465 100644 --- a/src/org/torproject/onionoo/WeightsDocumentWriter.java +++ b/src/org/torproject/onionoo/WeightsDocumentWriter.java @@ -98,6 +98,10 @@ public class WeightsDocumentWriter implements FingerprintListener, this.compileGraphType(history, 3)); weightsDocument.setExitProbability( this.compileGraphType(history, 4)); + weightsDocument.setAdvertisedBandwidth( + this.compileGraphType(history, 5)); + weightsDocument.setConsensusWeight( + this.compileGraphType(history, 6)); return weightsDocument; } @@ -141,9 +145,11 @@ public class WeightsDocumentWriter implements FingerprintListener, totalMillis = 0L; intervalStartMillis += dataPointInterval; } - totalWeightTimesMillis += weight - * ((double) (endMillis - startMillis)); - totalMillis += (endMillis - startMillis); + if (weight >= 0.0) { + totalWeightTimesMillis += weight + * ((double) (endMillis - startMillis)); + totalMillis += (endMillis - startMillis); + } } dataPoints.add(totalMillis * 5L < dataPointInterval ? -1.0 : totalWeightTimesMillis / (double) totalMillis); diff --git a/src/org/torproject/onionoo/WeightsStatus.java b/src/org/torproject/onionoo/WeightsStatus.java index 872fd00..f5eacd9 100644 --- a/src/org/torproject/onionoo/WeightsStatus.java +++ b/src/org/torproject/onionoo/WeightsStatus.java @@ -40,7 +40,7 @@ class WeightsStatus extends Document { advertisedBandwidth); continue; } - if (parts.length != 9) { + if (parts.length != 9 && parts.length != 11) { System.err.println("Illegal line '" + line + "' in weights " + "status file. Skipping this line."); continue; @@ -65,7 +65,11 @@ class WeightsStatus extends Document { Double.parseDouble(parts[5]), Double.parseDouble(parts[6]), Double.parseDouble(parts[7]), - Double.parseDouble(parts[8]) }; + Double.parseDouble(parts[8]), -1.0, -1.0 }; + if (parts.length == 11) { + weights[5] = Double.parseDouble(parts[9]); + weights[6] = Double.parseDouble(parts[10]); + } this.history.put(interval, weights); } s.close(); diff --git a/src/org/torproject/onionoo/WeightsStatusUpdater.java b/src/org/torproject/onionoo/WeightsStatusUpdater.java index 9b45f95..24c98ff 100644 --- a/src/org/torproject/onionoo/WeightsStatusUpdater.java +++ b/src/org/torproject/onionoo/WeightsStatusUpdater.java @@ -101,6 +101,7 @@ public class WeightsStatusUpdater implements DescriptorListener, private SortedMap<String, double[]> calculatePathSelectionProbabilities( RelayNetworkStatusConsensus consensus) { + boolean containsBandwidthWeights = false; double wgg = 1.0, wgd = 1.0, wmg = 1.0, wmm = 1.0, wme = 1.0, wmd = 1.0, wee = 1.0, wed = 1.0; SortedMap<String, Integer> bandwidthWeights = @@ -118,6 +119,7 @@ public class WeightsStatusUpdater implements DescriptorListener, wmd = ((double) bandwidthWeights.get("Wmd")) / 10000.0; wee = ((double) bandwidthWeights.get("Wee")) / 10000.0; wed = ((double) bandwidthWeights.get("Wed")) / 10000.0; + containsBandwidthWeights = true; } } SortedMap<String, Double> @@ -137,11 +139,7 @@ public class WeightsStatusUpdater implements DescriptorListener, if (!relay.getFlags().contains("Running")) { continue; } - boolean isExit = relay.getFlags().contains("Exit") && - !relay.getFlags().contains("BadExit"); - boolean isGuard = relay.getFlags().contains("Guard"); String digest = relay.getDescriptor().toUpperCase(); - double advertisedBandwidth = 0.0; WeightsStatus weightsStatus = this.documentStore.retrieve( WeightsStatus.class, true, fingerprint); if (weightsStatus != null && @@ -151,53 +149,83 @@ public class WeightsStatusUpdater implements DescriptorListener, * descriptors are parsed before consensuses, so we're sure that * if there's a server descriptor for this relay, it'll be * contained in the weights status file by now. */ - advertisedBandwidth = + double advertisedBandwidth = (double) weightsStatus.getAdvertisedBandwidths().get(digest); + advertisedBandwidths.put(fingerprint, advertisedBandwidth); + totalAdvertisedBandwidth += advertisedBandwidth; } - double consensusWeight = (double) relay.getBandwidth(); - double guardWeight = (double) relay.getBandwidth(); - double middleWeight = (double) relay.getBandwidth(); - double exitWeight = (double) relay.getBandwidth(); - 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; + if (relay.getBandwidth() >= 0L) { + double consensusWeight = (double) relay.getBandwidth(); + consensusWeights.put(fingerprint, consensusWeight); + totalConsensusWeight += consensusWeight; + if (containsBandwidthWeights) { + double guardWeight = (double) relay.getBandwidth(); + double middleWeight = (double) relay.getBandwidth(); + double exitWeight = (double) relay.getBandwidth(); + boolean isExit = relay.getFlags().contains("Exit") && + !relay.getFlags().contains("BadExit"); + boolean isGuard = relay.getFlags().contains("Guard"); + 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; + } } - advertisedBandwidths.put(fingerprint, advertisedBandwidth); - consensusWeights.put(fingerprint, consensusWeight); - guardWeights.put(fingerprint, guardWeight); - middleWeights.put(fingerprint, middleWeight); - exitWeights.put(fingerprint, exitWeight); - totalAdvertisedBandwidth += advertisedBandwidth; - totalConsensusWeight += consensusWeight; - totalGuardWeight += guardWeight; - totalMiddleWeight += middleWeight; - totalExitWeight += exitWeight; } SortedMap<String, double[]> pathSelectionProbabilities = new TreeMap<String, double[]>(); - for (NetworkStatusEntry relay : - consensus.getStatusEntries().values()) { - String fingerprint = relay.getFingerprint(); - double[] probabilities = new double[] { - advertisedBandwidths.get(fingerprint) - / totalAdvertisedBandwidth, - consensusWeights.get(fingerprint) / totalConsensusWeight, - guardWeights.get(fingerprint) / totalGuardWeight, - middleWeights.get(fingerprint) / totalMiddleWeight, - exitWeights.get(fingerprint) / totalExitWeight }; + SortedSet<String> fingerprints = new TreeSet<String>(); + fingerprints.addAll(consensusWeights.keySet()); + fingerprints.addAll(advertisedBandwidths.keySet()); + for (String fingerprint : fingerprints) { + double[] probabilities = new double[] { -1.0, -1.0, -1.0, -1.0, + -1.0, -1.0, -1.0 }; + if (consensusWeights.containsKey(fingerprint) && + totalConsensusWeight > 0.0) { + probabilities[1] = consensusWeights.get(fingerprint) / + totalConsensusWeight; + probabilities[6] = consensusWeights.get(fingerprint); + } + if (guardWeights.containsKey(fingerprint) && + totalGuardWeight > 0.0) { + probabilities[2] = guardWeights.get(fingerprint) / + totalGuardWeight; + } + if (middleWeights.containsKey(fingerprint) && + totalMiddleWeight > 0.0) { + probabilities[3] = middleWeights.get(fingerprint) / + totalMiddleWeight; + } + if (exitWeights.containsKey(fingerprint) && + totalExitWeight > 0.0) { + probabilities[4] = exitWeights.get(fingerprint) / + totalExitWeight; + } + if (advertisedBandwidths.containsKey(fingerprint) && + totalAdvertisedBandwidth > 0.0) { + probabilities[0] = advertisedBandwidths.get(fingerprint) + / totalAdvertisedBandwidth; + probabilities[5] = advertisedBandwidths.get(fingerprint); + } pathSelectionProbabilities.put(fingerprint, probabilities); } return pathSelectionProbabilities; diff --git a/web/protocol.html b/web/protocol.html index 0c191bf..2d51621 100644 --- a/web/protocol.html +++ b/web/protocol.html @@ -1715,6 +1715,30 @@ The specification of this history object is similar to that in the </li> +<li> +advertised_bandwidth +<code class="typeof">object</code> +optional + +History object containing the absolute advertised bandwidth of this relay. +The specification of this history object is similar to that in the +advertised_bandwidth_fraction field above. +Added on June 18, 2014. + +</li> + +<li> +consensus_weight +<code class="typeof">object</code> +optional + +History object containing the absolute consensus weight of this relay. +The specification of this history object is similar to that in the +advertised_bandwidth_fraction field above. +Added on June 18, 2014. + +</li> + </ul> </div>

1 0

r26859: {website} Added Georg to the signers page. (website/trunk/docs/en)
by Matt Pagan 08 Jul '14

08 Jul '14

Author: mttp Date: 2014-07-09 03:09:43 +0000 (Wed, 09 Jul 2014) New Revision: 26859 Modified: website/trunk/docs/en/signing-keys.wml Log: Added Georg to the signers page. Modified: website/trunk/docs/en/signing-keys.wml =================================================================== --- website/trunk/docs/en/signing-keys.wml 2014-07-08 02:24:40 UTC (rev 26858) +++ website/trunk/docs/en/signing-keys.wml 2014-07-09 03:09:43 UTC (rev 26859) @@ -23,7 +23,8 @@ packages for RPMs, Windows, and OS X.</li> <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org repositories and archives.</li> - <li>Mike Perry (0x0E3A92E4) signs the TBB 3.x releases.</li> + <li>Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), and sometimes + Linus Nordberg (0x23291265) sign the Tor Browser releases.</li> <li>Damian Johnson (0x9ABBEEC6) signs Arm releases.</li> <li>Sebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor Browser Bundles.</li> <li>The Tails team (0xBE2CD9C1) signs the Tails live system @@ -150,6 +151,18 @@ uid [jpeg image of size 2906] sub 4096R/153E576C 2013-04-23 [expires: 2014-04-23] + + pub 4096R/4B7C3223 2013-07-30 + Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A 81A1 9437 3AA9 4B7C 3223 + uid Georg Koppen <gk(a)torproject.org> + uid Georg Koppen <groeg(a)vfemail.net> + uid Georg Koppen <georg(a)getfoxyproxy.org> + sub 4096R/97955E07 2013-07-30 [expires: 2014-07-30] + sub 4096R/AC3A821D 2013-07-30 [expires: 2014-07-30] + sub 4096R/A97A53DC 2014-07-08 [expires: 2015-07-08] + sub 4096R/E5AE3C98 2014-07-08 [expires: 2015-07-08] + + </pre> </div>

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit 0235ffc101d7c8eb7ba9302bffcf59ab93e849be Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 23:45:08 2014 +0000 Update translations for gettor_completed --- es/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/gettor.po b/es/gettor.po index 58cd1d1..b4ca842 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-07-08 23:10+0000\n" +"PO-Revision-Date: 2014-07-08 23:20+0000\n" "Last-Translator: Paola Falcon <cacoepy(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor] Update translations for gettor
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit 3332be14cfa00bfaa95aa222357af2df09df1057 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 23:45:05 2014 +0000 Update translations for gettor --- es/gettor.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/gettor.po b/es/gettor.po index 58cd1d1..b4ca842 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-07-08 23:10+0000\n" +"PO-Revision-Date: 2014-07-08 23:20+0000\n" "Last-Translator: Paola Falcon <cacoepy(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n"

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 08 Jul '14

08 Jul '14

commit ce950ebdbe147d74c351380e0730ee0687e7a512 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 8 23:15:12 2014 +0000 Update translations for gettor_completed --- es/gettor.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 7f31bd1..58cd1d1 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -4,10 +4,11 @@ # # Translators: # her_tor_es_ar <cvmay08(a)gmail.com>, 2014 -# Gioyik <gioyik(a)gmail.com>, 2011 +# Giovanny Andres Gongora Granada <gioyik(a)gmail.com>, 2011 # henrycito <henry.izurieta(a)gmail.com>, 2014 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 -# lenazun <lenazun(a)gmail.com>, 2011 +# Lena <lenazun(a)gmail.com>, 2011 +# Paola Falcon <cacoepy(a)gmail.com>, 2014 # strel, 2013 # strel, 2012-2013 msgid "" @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2014-05-09 22:30+0000\n" -"Last-Translator: her_tor_es_ar <cvmay08(a)gmail.com>\n" +"PO-Revision-Date: 2014-07-08 23:10+0000\n" +"Last-Translator: Paola Falcon <cacoepy(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -129,7 +130,7 @@ msgstr " gettor+ar(a)torproject.org: Árabe\n gettor+de(a)torproject.org: #: lib/gettor/i18n.py:92 msgid "If you select no language, you will receive the English version." -msgstr "Si no selecciona un idioma, recibirá la versión en inglés." +msgstr "Si no seleccionas un idioma, recibirás la versión en inglés." #: lib/gettor/i18n.py:94 msgid "" @@ -157,13 +158,13 @@ msgstr "Simplemente incluya la palabra clave 'split' en una nueva línea que no msgid "" "Sending this text in an email to GetTor will cause it to send you \n" "the Tor Browser Bundle in a number of 1,4MB attachments." -msgstr "Enviar este texto en un correo a GetTor causará que le enviemos el Paquete de Navegador Tor en varios archivos adjuntos de 1,4MB." +msgstr "Enviar este texto en un correo a GetTor causará que te enviemos el Paquete de Navegador Tor en varios archivos adjuntos de 1,4MB." #: lib/gettor/i18n.py:110 msgid "" "After having received all parts, you need to re-assemble them to \n" "one package again. This is done as follows:" -msgstr "Después de haber recibido todas las partes, necesita re-ensamblarlas\nen un sólo paquete de nuevo. Esto se hace de este modo:" +msgstr "Después de haber recibido todas las partes, necesitas re-ensamblarlas\nde nuevo en un sólo paquete. Esto se hace de este modo:" #: lib/gettor/i18n.py:113 msgid "1.) Save all received attachments into one folder on your disk."

1 0