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

[tor-messenger-build/master] Update the changelog
by sukhbir＠torproject.org 07 Jan '17

07 Jan '17

commit fa2e55c0911b6e6ceab756b6a5f78da41549d06d Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jan 7 01:08:46 2017 -0500 Update the changelog --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6cfd17c..27348f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Tor Messenger 0.3.0b3 -- * All Platforms + * Windows + * Fix automatic generation of complete MAR files Tor Messenger 0.3.0b2 -- December 29, 2016 * All Platforms

1 0

[tor-messenger-build/master] Remove redundant $PLUGINSDIR from Windows build
by sukhbir＠torproject.org 07 Jan '17

07 Jan '17

commit d3834a997f73c481db9458d67ccc06a2852f9d9b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sat Jan 7 01:00:09 2017 -0500 Remove redundant $PLUGINSDIR from Windows build The version of 7z (9.02) we are using for the builds creates redundant $PLUGINSDIR which we remove. --- projects/tor-messenger/build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index 1415f22..817af38 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -64,6 +64,8 @@ cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ [% IF c("var/windows") -%] 7z x ../../../../../../../[% c('input_files_by_name/tor-browser') %] +# The version of 7z (9.02) we are using for the builds creates redundant $PLUGINSDIR which we remove. +rm -rf \$PLUGINSDIR Browser/\$PLUGINSDIR mv \$_OUTDIR tor-browser_en-US cp -pf tor-browser_en-US/Browser/libssp-0.dll tor-browser_en-US/Browser/TorBrowser/Tor/

1 0

[onionoo/master] Support email addresses in qualified search terms.
by karsten＠torproject.org 06 Jan '17

06 Jan '17

commit 66a1986644d919b426c4de562043cda559bca5ac Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 19:53:54 2017 +0100 Support email addresses in qualified search terms. More generally, accept the same characters in qualified search terms as in their parameter equivalents. This includes the '@' sign and others in search terms like 'contact:user@domain.com', which were supported in the contact parameter but not in the search parameter before. Fixes #10972. --- CHANGELOG.md | 2 ++ src/main/java/org/torproject/onionoo/server/ResourceServlet.java | 4 ++-- .../java/org/torproject/onionoo/server/ResourceServletTest.java | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d457e60..e02f36f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Unify the build process by adding git-submodule metrics-base in src/build and removing all centralized parts of the build process. + - Accept the same characters in qualified search terms as in their + parameter equivalents. # Changes in version 3.1-1.0.0 - 2016-11-23 diff --git a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java index 92d0d81..c1c5757 100644 --- a/src/main/java/org/torproject/onionoo/server/ResourceServlet.java +++ b/src/main/java/org/torproject/onionoo/server/ResourceServlet.java @@ -362,7 +362,7 @@ public class ResourceServlet extends HttpServlet { private static Pattern searchQueryStringPattern = Pattern.compile("(?:.*[\\?&])*?" // lazily skip other parameters - + "search=([0-9a-zA-Z+/\\.: \\$\\[\\]%]+)" // capture parameter + + "search=([\\p{Graph} &&[^&]]+)" // capture parameter + "(?:&.*)*"); // skip remaining parameters private static Pattern searchParameterPattern = @@ -370,7 +370,7 @@ public class ResourceServlet extends HttpServlet { + "^[0-9a-zA-Z+/]{1,27}$|" /* Base64 fingerprint. */ + "^[0-9a-zA-Z\\.]{1,19}$|" /* Nickname or IPv4 address. */ + "^\\[[0-9a-fA-F:\\.]{1,39}\\]?$|" /* IPv6 address. */ - + "^[a-zA-Z_]+:[0-9a-zA-Z_,-]+$" /* Qualified search term. */); + + "^[a-zA-Z_]+:\\p{Graph}+$" /* Qualified search term. */); protected static String[] parseSearchParameters(String queryString) { Matcher searchQueryStringMatcher = searchQueryStringPattern.matcher( diff --git a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java index ac466c9..93c3a34 100644 --- a/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/onionoo/server/ResourceServletTest.java @@ -869,6 +869,14 @@ public class ResourceServletTest { this.assertErrorStatusCode("/summary?search=limit:1", 400); } + + @Test() + public void testSearchEmailAddress() { + this.assertSummaryDocument( + "/summary?search=contact:<tor+steven.murdoch(a)cl.cam.ac.uk>", 1, + new String[] { "TimMayTribute" }, 0, null); + } + @Test() public void testLookupFingerprint() { this.assertSummaryDocument(

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Jan '17

06 Jan '17

commit e7a3f57bcca8504ce1cfffae221a3e077c92f460 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 19:48:21 2017 +0000 Update translations for tor-browser-manual --- sv/sv.po | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sv/sv.po b/sv/sv.po index ec89d1c..9a4f79a 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -48,6 +48,9 @@ msgid "" " will not be able to track your internet activity, including the names and " "addresses of the websites you visit." msgstr "" +"Din Internetleverantör, och alla som bevakar på din anslutning lokalt, " +"kommer inte att kunna spåra din Internet-aktivitet, inklusive namn och " +"adresser till de webbplatser du besöker." #: about-tor-browser.page:25 msgid "" @@ -56,12 +59,19 @@ msgid "" "real Internet (IP) address, and will not know who you are unless you " "explicitly identify yourself." msgstr "" +"Operatörerna av de webbplatser och tjänster som du använder, och alla som " +"bevakar dem, kommer att se en förbindelse som kommer från Tor-nätverket " +"istället för din riktiga Internet (IP) adress, och kommer inte att veta vem " +"du är om du inte uttryckligen identifiera dig." #: about-tor-browser.page:34 msgid "" "In addition, Tor Browser is designed to prevent websites from " "“fingerprinting” or identifying you based on your browser configuration." msgstr "" +"Dessutom är Tor Browser utformad för att förhindra webbsidor från " +"\"fingeravtryck\" eller identifiera dig baserat på din " +"webbläsarkonfiguration." #: about-tor-browser.page:39 msgid "" @@ -69,6 +79,9 @@ msgid "" " valid for a single session (until Tor Browser is exited or a <link xref" "=\"managing-identities#new-identity\">New Identity</link> is requested)." msgstr "" +"Som standard behåller Tor Browser inte någon webbhistorik . Cookies är " +"endast giltig för en enda session (tills Tor Browser avslutas eller en <link" +" xref=\"managing-identities#new-identity\">Ny identitet </link> begärs)." #: about-tor-browser.page:50 msgid "How Tor works" @@ -1018,7 +1031,7 @@ msgstr "Om Tor används eller ej" #: security-slider.page:6 msgid "Configuring Tor Browser for security and usability" -msgstr "" +msgstr "Konfigurera Tor Browser för säkerhet och användbarhet" #: security-slider.page:10 msgid "Security Slider"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 06 Jan '17

06 Jan '17

commit bf5e137a05f882fcefc5a9607ee46ad0b05f46c3 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 19:48:09 2017 +0000 Update translations for tails-greeter-2 --- sv/sv.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sv/sv.po b/sv/sv.po index 4b0a01f..48a2258 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -58,6 +58,8 @@ msgid "" "This option makes Tails look like Microsoft Windows 10. This can be useful " "to avoid attracting suspicion in public places." msgstr "" +"Det här alternativet gör Tails att se ut som Microsoft Windows 10. Detta kan" +" vara användbart för att undvika att locka misstanke på offentliga platser." #. This string will never be displayed in the 1st version of the greeter. #: ../data/greeter.ui.h:12

1 0

[collector/master] Resolve checkstyle complaints.
by karsten＠torproject.org 06 Jan '17

06 Jan '17

commit 71ce5c8ba4e68fff587d129441a0265b3bc32e66 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jan 6 12:03:13 2017 +0100 Resolve checkstyle complaints. Fixes #21143. --- src/main/java/org/torproject/collector/Main.java | 7 ++++--- .../collector/bridgedescs/BridgeDescriptorParser.java | 4 ++-- .../collector/bridgedescs/BridgeSnapshotReader.java | 3 ++- .../org/torproject/collector/conf/Configuration.java | 3 ++- .../org/torproject/collector/cron/CollecTorMain.java | 6 ++++-- .../torproject/collector/relaydescs/ArchiveWriter.java | 3 ++- .../relaydescs/RelayDescriptorDownloader.java | 16 ++++++++-------- .../collector/torperf/TorperfDownloader.java | 4 ++-- .../torproject/collector/sync/SyncPersistenceTest.java | 18 +++++++++++------- 9 files changed, 37 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/collector/Main.java index 289cf30..0feeec9 100644 --- a/src/main/java/org/torproject/collector/Main.java +++ b/src/main/java/org/torproject/collector/Main.java @@ -42,7 +42,8 @@ public class Main { /** All possible main classes. * If a new CollecTorMain class is available, just add it to this map. */ - static final Map<Key, Class<? extends CollecTorMain>> collecTorMains = new HashMap<>(); + static final Map<Key, Class<? extends CollecTorMain>> collecTorMains = + new HashMap<>(); static { // add a new main class here collecTorMains.put(Key.BridgedescsActivated, SanitizedBridgesWriter.class); @@ -91,8 +92,8 @@ public class Main { private static void writeDefaultConfig(Path confPath) { try { - Files.copy(Main.class.getClassLoader().getResource(CONF_FILE).openStream(), - confPath, StandardCopyOption.REPLACE_EXISTING); + Files.copy(Main.class.getClassLoader().getResource(CONF_FILE) + .openStream(), confPath, StandardCopyOption.REPLACE_EXISTING); printUsage("Could not find config file. In the default " + "configuration, we are not configured to read data from any " + "data source or write data to any data sink. You need to " diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java index 64b1ebd..7c83884 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java @@ -31,8 +31,8 @@ public class BridgeDescriptorParser { /** Parses the first line of the given descriptor data to determine the * descriptor type and passes it to the sanitized bridges writer. */ - public void parse(byte[] allData, String dateTime, String authorityFingerprint) - throws ConfigurationException { + public void parse(byte[] allData, String dateTime, + String authorityFingerprint) throws ConfigurationException { try { BufferedReader br = new BufferedReader(new StringReader( new String(allData, "US-ASCII"))); diff --git a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java index 2a9b568..9d8b06a 100644 --- a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java +++ b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java @@ -37,7 +37,8 @@ public class BridgeSnapshotReader { * Reads the half-hourly snapshots of bridge descriptors from Bifroest. */ public BridgeSnapshotReader(BridgeDescriptorParser bdp, - File bridgeDirectoriesDir, File statsDirectory) throws ConfigurationException { + File bridgeDirectoriesDir, File statsDirectory) + throws ConfigurationException { if (bdp == null || bridgeDirectoriesDir == null || statsDirectory == null) { diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java index b63a00c..d194a94 100644 --- a/src/main/java/org/torproject/collector/conf/Configuration.java +++ b/src/main/java/org/torproject/collector/conf/Configuration.java @@ -256,7 +256,8 @@ public class Configuration extends Observable implements Cloneable { * Returns a {@code SourceType} as List, e.g. * {@code sourcetypeproperty = Remote, Sync}. */ - public Set<SourceType> getSourceTypeSet(Key key) throws ConfigurationException { + public Set<SourceType> getSourceTypeSet(Key key) + throws ConfigurationException { Set<SourceType> res = null; try { checkClass(key, SourceType[].class); diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/collector/cron/CollecTorMain.java index c9c931f..8581310 100644 --- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java +++ b/src/main/java/org/torproject/collector/cron/CollecTorMain.java @@ -78,7 +78,8 @@ public abstract class CollecTorMain extends SyncManager logger.info("Finished sync-run of module {} of CollecTor.", module()); } } catch (Throwable th) { // Catching all (cf. above). - logger.error("Sync-run of {} module failed: {}", module(), th.getMessage(), th); + logger.error("Sync-run of {} module failed: {}", module(), + th.getMessage(), th); } } @@ -90,7 +91,8 @@ public abstract class CollecTorMain extends SyncManager private boolean isSyncOnly() throws ConfigurationException { String key = this.syncMarker() + SOURCES; - return this.isSync() && config.getSourceTypeSet(Key.valueOf(key)).size() == 1; + return this.isSync() + && config.getSourceTypeSet(Key.valueOf(key)).size() == 1; } /** Wrapper for <code>run</code>. */ diff --git a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java index 20d0663..f4ed1e8 100644 --- a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java +++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java @@ -671,7 +671,8 @@ public class ArchiveWriter extends CollecTorMain { dayDirectoryFileFormat.setTimeZone(TimeZone.getTimeZone("UTC")); File tarballFile = Paths.get(this.outputDirectory, MICRODESC, yearMonthDirectoryFormat.format(validAfter), CONSENSUS_MICRODESC, - dayDirectoryFileFormat.format(validAfter) + "-consensus-microdesc").toFile(); + dayDirectoryFileFormat.format(validAfter) + + "-consensus-microdesc").toFile(); boolean tarballFileExistedBefore = tarballFile.exists(); File rsyncFile = Paths.get(recentPathName, RELAY_DESCRIPTORS, MICRODESCS, CONSENSUS_MICRODESC, tarballFile.getName()).toFile(); diff --git a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java index 841a63b..0d5dc6d 100644 --- a/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java +++ b/src/main/java/org/torproject/collector/relaydescs/RelayDescriptorDownloader.java @@ -53,7 +53,8 @@ public class RelayDescriptorDownloader { * - "consensus-microdesc,<validafter>,<parsed>", * - "vote,<validafter>,<fingerprint>,<parsed>", * - "server,<published>,<relayid>,<descid>,<parsed>", - * - "extra,<published>,<relayid>,<descid>,<parsed>", or + * - "extra,<published>,<relayid>,<descid>,<parsed>", + * or * - "micro,<validafter>,<relayid>,<descid>,<parsed>". * </p> */ @@ -69,9 +70,9 @@ public class RelayDescriptorDownloader { /** * Map from base64 microdescriptor digests to keys in missingDescriptors - * ("micro,<validafter>,<relayid>,<descid>"). We need this map, because - * we can't learn <validafter> or <relayid> from parsing - * microdescriptors, but we need to know <validafter> to store + * ("micro,<validafter>,<relayid>,<descid>"). We need this + * map, because we can't learn <validafter> or <relayid> from + * parsing microdescriptors, but we need to know <validafter> to store * microdescriptors to disk and both <validafter> and <relayid> to * remove microdescriptors from the missing list. There are potentially * many matching keys in missingDescriptors for the same microdescriptor @@ -508,10 +509,9 @@ public class RelayDescriptorDownloader { } /** - * We have parsed a microdesc consensus. Take this microdesc consensus - * off the missing list and add the <code>microdescriptors</code> which - * are in the format "<validafter>,<relayid>,<descid>" to that - * list. + * We have parsed a microdesc consensus. Take this microdesc consensus off the + * missing list and add the <code>microdescriptors</code> which are in the + * format "<validafter>,<relayid>,<descid>" to that list. */ public void haveParsedMicrodescConsensus(String validAfter, Set<String> microdescriptors) { diff --git a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java index 8b5df05..db18267 100644 --- a/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java +++ b/src/main/java/org/torproject/collector/torperf/TorperfDownloader.java @@ -65,8 +65,8 @@ public class TorperfDownloader extends CollecTorMain { this.torperfFilesLines = config.getStringArray(Key.TorperfFilesLines); this.torperfOutputDirectory = new File(config.getPath(Key.OutputPath).toString(), TORPERF); - this.torperfLastMergedFile = new File(config.getPath(Key.StatsPath).toFile(), - "torperf-last-merged"); + this.torperfLastMergedFile = + new File(config.getPath(Key.StatsPath).toFile(), "torperf-last-merged"); if (!this.torperfOutputDirectory.exists()) { this.torperfOutputDirectory.mkdirs(); } diff --git a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java index 665f2ea..755ada8 100644 --- a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java +++ b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java @@ -38,7 +38,7 @@ public class SyncPersistenceTest { return Arrays.asList(new Object[][] { {"exit-lists/2016-09-20-13-02-00", // expected recent path - new String[]{"exit-lists/2016/09/20/2016-09-20-13-02-00"}, // expected out path + new String[]{"exit-lists/2016/09/20/2016-09-20-13-02-00"}, // exp. out "2016-09-20-13-02-00", // test-filename in src/test/resources Integer.valueOf(1), // expected recent count of descs files Integer.valueOf(1)}, // expected output count of descs files @@ -70,7 +70,8 @@ public class SyncPersistenceTest { Integer.valueOf(10)}, {"relay-descriptors/consensuses/2016-09-20-13-00-00-consensus", - new String[]{"relay-descriptors/consensus/2016/09/20/2016-09-20-13-00-00-consensus"}, + new String[]{"relay-descriptors/consensus/2016/09/20/" + + "2016-09-20-13-00-00-consensus"}, "2016-09-20-13-00-00-consensus", Integer.valueOf(1), Integer.valueOf(1)}, @@ -86,7 +87,8 @@ public class SyncPersistenceTest { {"relay-descriptors/votes/2016-10-01-16-00-00-vote" + "-0232AF901C31A04EE9848595AF9BB7620D4C5B2E" + "-FEE63B4AB7CE5A6BDD09E9A5C4F01BD61EB7E4F1", - new String[]{"relay-descriptors/vote/2016/10/01/2016-10-01-16-00-00-vote" + new String[]{"relay-descriptors/vote/2016/10/01/" + + "2016-10-01-16-00-00-vote" + "-0232AF901C31A04EE9848595AF9BB7620D4C5B2E" + "-FEE63B4AB7CE5A6BDD09E9A5C4F01BD61EB7E4F1"}, "2016-10-01-16-00-00-vote-0232AF901C31A04EE9848595AF9BB7620D4C5B2E-" @@ -97,7 +99,8 @@ public class SyncPersistenceTest { {"relay-descriptors/votes/2016-09-20-13-00-00-vote-" + "49015F787433103580E3B66A1707A00E60F2D15B" + "-60ADC6BEC262AE921A1037D54C8A3976367DBE87", - new String[]{"relay-descriptors/vote/2016/09/20/2016-09-20-13-00-00-vote-" + new String[]{"relay-descriptors/vote/2016/09/20/" + + "2016-09-20-13-00-00-vote-" + "49015F787433103580E3B66A1707A00E60F2D15B" + "-60ADC6BEC262AE921A1037D54C8A3976367DBE87"}, "2016-09-20-13-00-00-vote-49015F787433103580E3B66A1707A00E60F2D15B" @@ -234,8 +237,8 @@ public class SyncPersistenceTest { makeTemporaryFolders(); DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser(); SyncPersistence persist = new SyncPersistence(conf); - persist.storeDescs(dp.parseDescriptors(bytesFromResource(), filename), filename, - 1475694377000L); + persist.storeDescs(dp.parseDescriptors(bytesFromResource(), filename), + filename, 1475694377000L); List<File> recentList = new ArrayList<>(); List<File> outputList = new ArrayList<>(); Files.walkFileTree(output.toPath(), new FileCollector(outputList)); @@ -268,7 +271,8 @@ public class SyncPersistenceTest { assertEquals(expContent.size(), content.size()); int contentSize = content.size(); for (String line : expContent) { - assertTrue("Couln't remove " + line + " from " + recentList.get(0), content.remove(line)); + assertTrue("Couln't remove " + line + " from " + recentList.get(0), + content.remove(line)); assertEquals(--contentSize, content.size()); } assertTrue("Lines left over: " + content, content.isEmpty());

1 0

[depictor/master] Add Shared Random, closes 20763
by tom＠torproject.org 06 Jan '17

06 Jan '17

commit 63d38f33ecfeea6750c7b18d62a3d6a2fcabd5b7 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Jan 6 12:39:03 2017 -0600 Add Shared Random, closes 20763 --- website.py | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/website.py b/website.py index 0a2b4fe..6b8e28d 100755 --- a/website.py +++ b/website.py @@ -40,6 +40,7 @@ class WebsiteWriter: self._write_recommended_versions() self._write_consensus_parameters() self._write_authority_keys() + self._write_shared_random() self._write_protocols() self._write_bandwidth_scanner_status(True) self._write_fallback_directory_status(True) @@ -602,6 +603,90 @@ class WebsiteWriter: + "</p>\n") #----------------------------------------------------------------------------------------- + def sharedRandomToStr(self, sr): + s = "[" + s += "V:" + str(sr.version) + " " + s += "A:" + str(sr.algorithm) + " " + s += "C:" + sr.commit + " " + s += "R:" + sr.reveal + return s + "]" + def _write_shared_random(self): + """ + Write the shared random information of each directory authority + """ + self.site.write("<br>\n\n\n" + + " " + + "<a name=\"sharedrandom\">\n" + + "<h3><a href=\"#sharedrandom\" class=\"anchor\">" + + "Shared Random</a></h3>\n" + + "<br>\n" + + "<table border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"\">\n" + + " <colgroup>\n" + + " <col width=\"140\">\n" + + " <col width=\"180\">\n" + + " <col width=\"480\">\n" + + " </colgroup>\n") + if not self.votes: + self.site.write(" <tr><td>(No votes.)</td><td></td></tr>\n") + else: + for dirauth_nickname in self.known_authorities: + if dirauth_nickname in self.votes: + vote = self.votes[dirauth_nickname] + + if vote.directory_authorities[0].is_shared_randomness_participate: + prev_error = "" + cur_error = "" + if vote.directory_authorities[0].shared_randomness_previous_reveal_count != self.consensus.shared_randomness_previous_reveal_count or \ + vote.directory_authorities[0].shared_randomness_previous_value != self.consensus.shared_randomness_previous_value: + prev_error = "oiv" + if vote.directory_authorities[0].shared_randomness_current_reveal_count != self.consensus.shared_randomness_current_reveal_count or \ + vote.directory_authorities[0].shared_randomness_current_value != self.consensus.shared_randomness_current_value: + cur_error = "oiv" + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td>Previous</td>\n" + + " <td" + prev_error + ">" + str(vote.directory_authorities[0].shared_randomness_previous_reveal_count) + + " " + str(vote.directory_authorities[0].shared_randomness_previous_value) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>Current</td>\n" + + " <td" + cur_error + ">" + str(vote.directory_authorities[0].shared_randomness_current_reveal_count) + + " " + str(vote.directory_authorities[0].shared_randomness_current_value) + "</td>\n" + + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td>Commitments</td>\n" + + " <td style=\"font-size:x-small\">" + ", <br />".join([self.sharedRandomToStr(x) for x in vote.directory_authorities[0].shared_randomness_commitments]) + "</td>\n" + + " </tr>\n") + else: + self.site.write(" <tr>\n" + + " <td><span class=\"oiv\">" + + dirauth_nickname + "</span></td>\n" + + " <td colspan=\"2\"><span class=\"oiv\">Does not participate" + + "</span></td>\n" + + " </tr>\n") + else: + self.site.write(" <tr>\n" + + " <td>" + dirauth_nickname + "</td>\n" + + " <td colspan=\"2\"><span class=\"oiv\">Vote Not Present<span></td>\n" + + " </tr>\n") + self.site.write(" <tr>\n" + + " <td class=\"ic\">consensus</td>\n" + + " <td class=\"ic\">Previous</td>\n" + + " <td class=\"ic\">" + str(self.consensus.shared_randomness_previous_reveal_count) + + " " + str(self.consensus.shared_randomness_previous_value) + "</td>\n" + + " </tr>\n" + + " <tr>\n" + + " <td></td>\n" + + " <td class=\"ic\">Current</td>\n" + + " <td class=\"ic\">" + str(self.consensus.shared_randomness_current_reveal_count) + + " " + str(self.consensus.shared_randomness_current_value) + "</td>\n" + + " </tr>\n" + + "</table>\n") + + #----------------------------------------------------------------------------------------- def protocolsToString(self, keys, v, c=None): s = "" for k in keys:

1 0

[stem/master] Include current and previous shared randomness values from consensus
by atagar＠torproject.org 06 Jan '17

06 Jan '17

commit d713b29b88dc3c0faec793f4568a7a07cdac22d6 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 6 10:25:27 2017 -0800 Include current and previous shared randomness values from consensus Oops! These fields are elsewhere in votes but they're present here in the consensus too... https://trac.torproject.org/projects/tor/ticket/21102 --- stem/descriptor/networkstatus.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/networkstatus.py b/stem/descriptor/networkstatus.py index 210975d..9818624 100644 --- a/stem/descriptor/networkstatus.py +++ b/stem/descriptor/networkstatus.py @@ -799,6 +799,11 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): :var int consensus_method: method version used to generate this consensus :var dict bandwidth_weights: dict of weight(str) => value(int) mappings + :var str shared_randomness_current_value: base64 encoded current shared + random value + :var str shared_randomness_previous_value: base64 encoded last shared random + value + **Vote Attributes:** :var list consensus_methods: list of ints for the supported method versions @@ -856,6 +861,8 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'required_client_protocols': ({}, _parse_required_client_protocols_line), 'required_relay_protocols': ({}, _parse_required_relay_protocols_line), 'params': ({}, _parse_header_parameters_line), + 'shared_randomness_previous_value': (None, _parse_shared_rand_previous_value), + 'shared_randomness_current_value': (None, _parse_shared_rand_current_value), 'signatures': ([], _parse_footer_directory_signature_line), 'bandwidth_weights': ({}, _parse_footer_bandwidth_weights_line), @@ -881,6 +888,8 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): 'required-client-protocols': _parse_required_client_protocols_line, 'required-relay-protocols': _parse_required_relay_protocols_line, 'params': _parse_header_parameters_line, + 'shared-rand-previous-value': _parse_shared_rand_previous_value, + 'shared-rand-current-value': _parse_shared_rand_current_value, } FOOTER_PARSER_FOR_LINE = { @@ -911,9 +920,7 @@ class NetworkStatusDocumentV3(NetworkStatusDocument): self.is_shared_randomness_participate = False self.shared_randomness_commitments = [] self.shared_randomness_previous_reveal_count = None - self.shared_randomness_previous_value = None self.shared_randomness_current_reveal_count = None - self.shared_randomness_current_value = None self._default_params = default_params self._header(document_file, validate)

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Jan '17

06 Jan '17

commit ef9e2b3271b667df28f59e3a3317f42d5d1ac487 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 13:18:23 2017 +0000 Update translations for tor-browser-manual --- ko_KR/ko_KR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko_KR/ko_KR.po b/ko_KR/ko_KR.po index 554834a..79e5f20 100644 --- a/ko_KR/ko_KR.po +++ b/ko_KR/ko_KR.po @@ -440,7 +440,7 @@ msgstr "" #: first-time.page:33 msgid "Configure" -msgstr "" +msgstr "구성" #: first-time.page:37 msgid ""

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 06 Jan '17

06 Jan '17

commit 513f4826fed4fb5c36d0b2f0d8132a9fc4576629 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 6 13:16:08 2017 +0000 Update translations for tor-launcher-network-settings --- ko_KR/network-settings.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ko_KR/network-settings.dtd b/ko_KR/network-settings.dtd index 1fdc20b..e6e9760 100644 --- a/ko_KR/network-settings.dtd +++ b/ko_KR/network-settings.dtd @@ -13,20 +13,20 @@ <!ENTITY torSettings.firstQuestion "무엇이 당신의 상황과 가장 가까운가요?"> <!ENTITY torSettings.configurePrompt1 "이 컴퓨터의 인터넷 연결은 검열 또는 프록시에 연결되어 있습니다."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> -<!ENTITY torSettings.configure "Configure"> +<!ENTITY torSettings.configurePrompt2 "저는  Tor 네트워크에 접속하는 데 브릿지나 로컬 프록시 설정을 필요로 합니다."> +<!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "나는 Tor 네트워크와 직접적인 연결을 하고 싶습니다."> <!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작할 것입니다."> <!ENTITY torSettings.connect "연결"> -<!ENTITY torSettings.proxyPageTitle "Local Proxy Configuration"> -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a local proxy to access the Internet?"> +<!ENTITY torSettings.proxyPageTitle "로컬 프록시 구성"> +<!ENTITY torSettings.proxyQuestion "이 컴퓨터로 인터넷에 접근할 때 로컬 프록시를 사용해야 하나요?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.bridgePageTitle "Tor Bridges Configuration"> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.proxyExplanation1 "당신이 회사, 학교 네트워크에서 접속하지 않는다면, 웬만하면 로컬 프록시는 필요하지 않습니다."> +<!ENTITY torSettings.proxyExplanation2 "당신이 이에 대해 잘 모른다면, 다른 브라우저의 인터넷 설정이나 시스템 네트워크 설정에서 로컬 프록시가 필요한 지 확인하세요."> +<!ENTITY torSettings.enterProxy "프록시 정보를 입력하세요."> +<!ENTITY torSettings.bridgePageTitle "Tor 브릿지 구성"> +<!ENTITY torSettings.bridgeQuestion "당신의 인터넷 서비스 제공자 (ISP)가 Tor 네트워크 연결을 차단 혹은 검열합니까?"> <!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> <!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">

1 0