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

[torspec/master] 14948: Document when GETINFO md/ and GETINFO ns/ exist
by nickm＠torproject.org 23 Aug '17

23 Aug '17

commit 3cc3b86299329f34e58c4e752b7af0b8aacb35a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 23 09:30:13 2017 -0400 14948: Document when GETINFO md/ and GETINFO ns/ exist --- control-spec.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 50a59dd..12a559f 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -550,8 +550,9 @@ need to use "md" instead.) "md/id/<OR identity>" or "md/name/<OR nickname>" -- the latest - microdescriptor for a given OR. [First implemented in - 0.2.3.8-alpha.] + microdescriptor for a given OR. Empty if we have no microdescriptor for + that OR (because we haven't downloaded one, or it isn't in the + consensus). [First implemented in 0.2.3.8-alpha.] "desc/download-enabled" -- "1" if we try to download router descriptors; "0" otherwise. [First implemented in 0.3.2.1-alpha] @@ -573,8 +574,8 @@ "ns/id/<OR identity>" or "ns/name/<OR nickname>" -- the latest router status info (v3 directory style) for a given OR. Router status - info is as given in - dir-spec.txt, and reflects the current beliefs of this Tor about the + info is as given in dir-spec.txt, and reflects the latest + consensus opinion about the router in question. Like directory clients, controllers MUST tolerate unrecognized flags and lines. The published date and descriptor digest are those believed to be best by this Tor, @@ -583,7 +584,7 @@ [In 0.2.0.9-alpha this switched from v2 directory style to v3] "ns/all" -- Router status info (v3 directory style) for all ORs we - have an opinion about, joined by newlines. + that the consensus has an opinion about, joined by newlines. [First implemented in 0.1.2.3-alpha.] [In 0.2.0.9-alpha this switched from v2 directory style to v3]

1 0

[torspec/master] 14312: Clarify the status of extra bytes in RELAY_END payload.
by nickm＠torproject.org 23 Aug '17

23 Aug '17

commit 0a4a064de27e59980474b687c4eb8ff89da19477 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 23 09:25:06 2017 -0400 14312: Clarify the status of extra bytes in RELAY_END payload. --- tor-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tor-spec.txt b/tor-spec.txt index 6dbdf93..176dfc1 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -1435,8 +1435,8 @@ see tor-design.pdf. circuit for that stream. The payload of a RELAY_END cell begins with a single 'reason' byte to - describe why the stream is closing, plus optional data (depending on - the reason.) The values are: + describe why the stream is closing. For some reasons, it contains + additional data (depending on the reason.) The values are: 1 -- REASON_MISC (catch-all for unlisted reasons) 2 -- REASON_RESOLVEFAILED (couldn't look up hostname)

1 0

[torbutton/maint-1.9.7] Bug 22989: Fix dimensions of new windows on macOS.
by gk＠torproject.org 23 Aug '17

23 Aug '17

commit 6aa6d6ef1355179d7198f0eb09405ac0968ba4e7 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 14 15:56:00 2017 -0700 Bug 22989: Fix dimensions of new windows on macOS. Before this patch, a new Tor Browser window, non-maximized, was showing a "don't maximize this window" notification briefly as soon as it was first displayed. Worse, the notification box that appears causes the window height to increase by 10 or 11 pixels and thus breaks our desired window dimension rounding. Our intended behavior is that this notification only be shown when the window is maximized by the user. I discovered that, on macOS, windowState === window.STATE_MAXIMIZED for a short time when the window is first created. Then it rapidly changes to windowState === window.STATE_NORMAL. So I added a `setTimeout` promise to postpone checking the window size until after window creation "settles" and that seems to be enough to ensure we avoid showing the spurious notification box at window creation. Also fixes Bug 22543, "Tor Browser 7.0 shows window resize warning on every new window for a few seconds". And fixes issues raised in comments 2 and 3 in that ticket as well. --- src/chrome/content/torbutton.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0c297aa..11f4b61 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2123,7 +2123,9 @@ var torbutton_resizelistener = onLocationChange: function(aProgress, aRequest, aURI) {}, onStateChange: function(aProgress, aRequest, aFlag, aStatus) { if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { - m_tb_resize_handler = function() { + m_tb_resize_handler = async function() { + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => setTimeout(resolve, 0)); if (window.windowState === 1) { if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {

1 0

[torbutton/master] Bug 22989: Fix dimensions of new windows on macOS.
by gk＠torproject.org 23 Aug '17

23 Aug '17

commit 97380447e4ab66a44abed4ec0aeb5eeabf86404e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 14 15:56:00 2017 -0700 Bug 22989: Fix dimensions of new windows on macOS. Before this patch, a new Tor Browser window, non-maximized, was showing a "don't maximize this window" notification briefly as soon as it was first displayed. Worse, the notification box that appears causes the window height to increase by 10 or 11 pixels and thus breaks our desired window dimension rounding. Our intended behavior is that this notification only be shown when the window is maximized by the user. I discovered that, on macOS, windowState === window.STATE_MAXIMIZED for a short time when the window is first created. Then it rapidly changes to windowState === window.STATE_NORMAL. So I added a `setTimeout` promise to postpone checking the window size until after window creation "settles" and that seems to be enough to ensure we avoid showing the spurious notification box at window creation. Also fixes Bug 22543, "Tor Browser 7.0 shows window resize warning on every new window for a few seconds". And fixes issues raised in comments 2 and 3 in that ticket as well. --- src/chrome/content/torbutton.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 0c297aa..11f4b61 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2123,7 +2123,9 @@ var torbutton_resizelistener = onLocationChange: function(aProgress, aRequest, aURI) {}, onStateChange: function(aProgress, aRequest, aFlag, aStatus) { if (aFlag & Ci.nsIWebProgressListener.STATE_STOP) { - m_tb_resize_handler = function() { + m_tb_resize_handler = async function() { + // Wait for end of execution queue to ensure we have correct windowState. + await new Promise(resolve => setTimeout(resolve, 0)); if (window.windowState === 1) { if (m_tb_prefs. getIntPref("extensions.torbutton.maximize_warnings_remaining") > 0) {

1 0

[onionoo/master] Remove extraneous (BETA) fields from clients objects.
by karsten＠torproject.org 23 Aug '17

23 Aug '17

commit 23bf1292718eac23c4c09daf0c2d10dcda333ca5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 22 09:39:34 2017 +0200 Remove extraneous (BETA) fields from clients objects. This change deserves a minor protocol version update to 4.1. Implements #22033. --- CHANGELOG.md | 4 +- .../torproject/onionoo/docs/ClientsDocument.java | 4 +- .../onionoo/docs/ClientsGraphHistory.java | 102 --------------------- .../onionoo/writer/ClientsDocumentWriter.java | 74 +-------------- 4 files changed, 10 insertions(+), 174 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8412f87..acfe8df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,10 @@ -# Changes in version 4.0-1.?.? - 2017-0?-?? +# Changes in version 4.1-1.?.? - 2017-0?-?? * Medium changes - Reset IPv6 exit-policy summary in details status if a newer server descriptor doesn't contain such a summary anymore. + - Remove optional fields "countries", "transports", and "versions" + from clients objects which were still labeled as beta. # Changes in version 4.0-1.3.0 - 2017-08-04 diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java b/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java index 2cc69c0..0b625b0 100644 --- a/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java +++ b/src/main/java/org/torproject/onionoo/docs/ClientsDocument.java @@ -16,10 +16,10 @@ public class ClientsDocument extends Document { } @SuppressWarnings("unused") - private Map<String, ClientsGraphHistory> average_clients; + private Map<String, GraphHistory> average_clients; public void setAverageClients( - Map<String, ClientsGraphHistory> averageClients) { + Map<String, GraphHistory> averageClients) { this.average_clients = averageClients; } } diff --git a/src/main/java/org/torproject/onionoo/docs/ClientsGraphHistory.java b/src/main/java/org/torproject/onionoo/docs/ClientsGraphHistory.java deleted file mode 100644 index 6b2bd3d..0000000 --- a/src/main/java/org/torproject/onionoo/docs/ClientsGraphHistory.java +++ /dev/null @@ -1,102 +0,0 @@ -/* Copyright 2014--2017 The Tor Project - * See LICENSE for licensing information */ - -package org.torproject.onionoo.docs; - -import java.util.ArrayList; -import java.util.List; -import java.util.SortedMap; - -public class ClientsGraphHistory { - - private String first; - - public void setFirst(long first) { - this.first = DateTimeHelper.format(first); - } - - public long getFirst() { - return DateTimeHelper.parse(this.first); - } - - private String last; - - public void setLast(long last) { - this.last = DateTimeHelper.format(last); - } - - public long getLast() { - return DateTimeHelper.parse(this.last); - } - - private Integer interval; - - public void setInterval(Integer interval) { - this.interval = interval; - } - - public Integer getInterval() { - return this.interval; - } - - private Double factor; - - public void setFactor(Double factor) { - this.factor = factor; - } - - public Double getFactor() { - return this.factor; - } - - private Integer count; - - public void setCount(Integer count) { - this.count = count; - } - - public Integer getCount() { - return this.count; - } - - private List<Integer> values = new ArrayList<>(); - - public void setValues(List<Integer> values) { - this.values = values; - } - - public List<Integer> getValues() { - return this.values; - } - - private SortedMap<String, Float> countries; - - public void setCountries(SortedMap<String, Float> countries) { - this.countries = countries; - } - - public SortedMap<String, Float> getCountries() { - return this.countries; - } - - private SortedMap<String, Float> transports; - - public void setTransports(SortedMap<String, Float> transports) { - this.transports = transports; - } - - public SortedMap<String, Float> getTransports() { - return this.transports; - } - - private SortedMap<String, Float> versions; - - public void setVersions(SortedMap<String, Float> versions) { - this.versions = versions; - } - - public SortedMap<String, Float> getVersions() { - return this.versions; - } -} - diff --git a/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java b/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java index 599ecff..f65a53a 100644 --- a/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java +++ b/src/main/java/org/torproject/onionoo/writer/ClientsDocumentWriter.java @@ -4,12 +4,12 @@ package org.torproject.onionoo.writer; import org.torproject.onionoo.docs.ClientsDocument; -import org.torproject.onionoo.docs.ClientsGraphHistory; import org.torproject.onionoo.docs.ClientsHistory; import org.torproject.onionoo.docs.ClientsStatus; import org.torproject.onionoo.docs.DateTimeHelper; import org.torproject.onionoo.docs.DocumentStore; import org.torproject.onionoo.docs.DocumentStoreFactory; +import org.torproject.onionoo.docs.GraphHistory; import org.torproject.onionoo.docs.UpdateStatus; import org.torproject.onionoo.util.FormattingUtils; @@ -20,9 +20,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.SortedMap; import java.util.SortedSet; -import java.util.TreeMap; /* * Clients status file produced as intermediate output: @@ -111,11 +109,11 @@ public class ClientsDocumentWriter implements DocumentWriter { SortedSet<ClientsHistory> history) { ClientsDocument clientsDocument = new ClientsDocument(); clientsDocument.setFingerprint(hashedFingerprint); - Map<String, ClientsGraphHistory> averageClients = new LinkedHashMap<>(); + Map<String, GraphHistory> averageClients = new LinkedHashMap<>(); for (int graphIntervalIndex = 0; graphIntervalIndex < this.graphIntervals.length; graphIntervalIndex++) { String graphName = this.graphNames[graphIntervalIndex]; - ClientsGraphHistory graphHistory = this.compileClientsHistory( + GraphHistory graphHistory = this.compileClientsHistory( graphIntervalIndex, history); if (graphHistory != null) { averageClients.put(graphName, graphHistory); @@ -125,7 +123,7 @@ public class ClientsDocumentWriter implements DocumentWriter { return clientsDocument; } - private ClientsGraphHistory compileClientsHistory( + private GraphHistory compileClientsHistory( int graphIntervalIndex, SortedSet<ClientsHistory> history) { long graphInterval = this.graphIntervals[graphIntervalIndex]; long dataPointInterval = @@ -135,10 +133,6 @@ public class ClientsDocumentWriter implements DocumentWriter { / dataPointInterval) * dataPointInterval; long millis = 0L; double responses = 0.0; - double totalResponses = 0.0; - SortedMap<String, Double> totalResponsesByCountry = new TreeMap<>(); - SortedMap<String, Double> totalResponsesByTransport = new TreeMap<>(); - SortedMap<String, Double> totalResponsesByVersion = new TreeMap<>(); for (ClientsHistory hist : history) { if (hist.getEndMillis() < intervalStartMillis) { continue; @@ -153,31 +147,6 @@ public class ClientsDocumentWriter implements DocumentWriter { intervalStartMillis += dataPointInterval; } responses += hist.getTotalResponses(); - totalResponses += hist.getTotalResponses(); - for (Map.Entry<String, Double> e : - hist.getResponsesByCountry().entrySet()) { - if (!totalResponsesByCountry.containsKey(e.getKey())) { - totalResponsesByCountry.put(e.getKey(), 0.0); - } - totalResponsesByCountry.put(e.getKey(), e.getValue() - + totalResponsesByCountry.get(e.getKey())); - } - for (Map.Entry<String, Double> e : - hist.getResponsesByTransport().entrySet()) { - if (!totalResponsesByTransport.containsKey(e.getKey())) { - totalResponsesByTransport.put(e.getKey(), 0.0); - } - totalResponsesByTransport.put(e.getKey(), e.getValue() - + totalResponsesByTransport.get(e.getKey())); - } - for (Map.Entry<String, Double> e : - hist.getResponsesByVersion().entrySet()) { - if (!totalResponsesByVersion.containsKey(e.getKey())) { - totalResponsesByVersion.put(e.getKey(), 0.0); - } - totalResponsesByVersion.put(e.getKey(), e.getValue() - + totalResponsesByVersion.get(e.getKey())); - } millis += (hist.getEndMillis() - hist.getStartMillis()); } dataPoints.add(millis * 2L < dataPointInterval @@ -217,7 +186,7 @@ public class ClientsDocumentWriter implements DocumentWriter { + (lastNonNullIndex - firstNonNullIndex) * dataPointInterval; double factor = ((double) maxValue) / 999.0; int count = lastNonNullIndex - firstNonNullIndex + 1; - ClientsGraphHistory graphHistory = new ClientsGraphHistory(); + GraphHistory graphHistory = new GraphHistory(); graphHistory.setFirst(firstDataPointMillis); graphHistory.setLast(lastDataPointMillis); graphHistory.setInterval((int) (dataPointInterval @@ -240,39 +209,6 @@ public class ClientsDocumentWriter implements DocumentWriter { (int) ((dataPoint * 999.0) / maxValue)); } graphHistory.setValues(values); - if (!totalResponsesByCountry.isEmpty()) { - SortedMap<String, Float> countries = new TreeMap<>(); - for (Map.Entry<String, Double> e : - totalResponsesByCountry.entrySet()) { - if (e.getValue() > totalResponses / 100.0) { - countries.put(e.getKey(), - (float) (e.getValue() / totalResponses)); - } - } - graphHistory.setCountries(countries); - } - if (!totalResponsesByTransport.isEmpty()) { - SortedMap<String, Float> transports = new TreeMap<>(); - for (Map.Entry<String, Double> e : - totalResponsesByTransport.entrySet()) { - if (e.getValue() > totalResponses / 100.0) { - transports.put(e.getKey(), - (float) (e.getValue() / totalResponses)); - } - } - graphHistory.setTransports(transports); - } - if (!totalResponsesByVersion.isEmpty()) { - SortedMap<String, Float> versions = new TreeMap<>(); - for (Map.Entry<String, Double> e : - totalResponsesByVersion.entrySet()) { - if (e.getValue() > totalResponses / 100.0) { - versions.put(e.getKey(), - (float) (e.getValue() / totalResponses)); - } - } - graphHistory.setVersions(versions); - } if (foundTwoAdjacentDataPoints) { return graphHistory; } else {

1 0

[tor-messenger-build/master] Update patch for temporary XMPP accounts (force autologin)
by sukhbir＠torproject.org 22 Aug '17

22 Aug '17

commit 0359c6483888b426099e1d2b5a5bdda8317f7ef7 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 22 13:14:56 2017 -0400 Update patch for temporary XMPP accounts (force autologin) --- .../0022-Bug-16606-Automatic-XMPP-accounts.patch | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 2f94dc3..2a71000 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From 8a8329f53e3ae6eaaec67fb698a4ab6f0a50d1e6 Mon Sep 17 00:00:00 2001 +From f0e0efda610e24a5e191ac5e6fd583a5b6c99724 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts @@ -8,10 +8,10 @@ password are randomly generated and in-band registration is performed automatically. This can also be used for throwaway accounts. --- chat/protocols/xmpp/xmpp-session.jsm | 39 +++++++++++++--------- - im/content/accountWizard.js | 34 +++++++++++++++++++ + im/content/accountWizard.js | 39 ++++++++++++++++++++++ im/content/accountWizard.xul | 1 + .../en-US/chrome/instantbird/accountWizard.dtd | 1 + - 4 files changed, 59 insertions(+), 16 deletions(-) + 4 files changed, 64 insertions(+), 16 deletions(-) diff --git a/chat/protocols/xmpp/xmpp-session.jsm b/chat/protocols/xmpp/xmpp-session.jsm index 1c001064bd..b5b9fde11e 100644 @@ -65,7 +65,7 @@ index 1c001064bd..b5b9fde11e 100644 let xml = '<?xml version="1.0"?>'; diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js -index 7efedd5ed5..f68767f1c8 100644 +index 7efedd5ed5..e0300bf6c4 100644 --- a/im/content/accountWizard.js +++ b/im/content/accountWizard.js @@ -133,6 +133,10 @@ var accountWizard = { @@ -90,7 +90,17 @@ index 7efedd5ed5..f68767f1c8 100644 } let bundle = document.getElementById("accountsBundle"); -@@ -395,6 +401,7 @@ var accountWizard = { +@@ -307,6 +313,9 @@ var accountWizard = { + }, + + showSummary: function aw_showSummary() { ++ if (this.register) { ++ document.getElementById("connectAutomatically").checked = true; ++ } + let rows = document.getElementById("summaryRows"); + let bundle = document.getElementById("accountsBundle"); + let child; +@@ -395,6 +404,7 @@ var accountWizard = { //FIXME: newMailNotification acc.setBool("register", document.getElementById("registerXMPP").checked); @@ -98,7 +108,7 @@ index 7efedd5ed5..f68767f1c8 100644 for (let i = 0; i < this.prefs.length; ++i) { let option = this.prefs[i]; -@@ -499,6 +506,33 @@ var accountWizard = { +@@ -499,6 +509,35 @@ var accountWizard = { this.displayProxyDescription(); }, @@ -117,6 +127,7 @@ index 7efedd5ed5..f68767f1c8 100644 + this.userNameBoxes[0].disabled = true; + this.userNameBoxes[0].value = this.getRandomString(7); + document.getElementById("accountWizard").canAdvance = true; ++ this.register = true; + } + else { + domain.disabled = false; @@ -126,6 +137,7 @@ index 7efedd5ed5..f68767f1c8 100644 + this.userNameBoxes[0].disabled = false; + this.userNameBoxes[0].value = ""; + document.getElementById("accountWizard").canAdvance = false; ++ this.register = false; + } + }, +

1 0

[nyx/master] Combine address and nickname caches
by atagar＠torproject.org 22 Aug '17

22 Aug '17

commit 4614de992541bdcc68ddc1b18d6d7abb7c179911 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 20 15:47:16 2017 -0700 Combine address and nickname caches First obvious memory savings we can make is to combine these caches. They're both 'fingerprint => relay data' caches that are populated side-by-side. No reason for them to be separate. --- nyx/tracker.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/nyx/tracker.py b/nyx/tracker.py index 4ac76aa..2c89467 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -809,8 +809,7 @@ class ConsensusTracker(object): def __init__(self): self._fingerprint_cache = {} # {address => [(port, fingerprint), ..]} for relays - self._nickname_cache = {} # fingerprint => nickname lookup cache - self._address_cache = {} + self._relay_cache = {} # fingerprint => address, orport, nickname lookup cache self._my_router_status_entry = None self._my_router_status_entry_time = 0 @@ -833,10 +832,9 @@ class ConsensusTracker(object): nickname = r_comp[1] self._fingerprint_cache.setdefault(address, []).append((or_port, fingerprint)) - self._address_cache[fingerprint] = (address, or_port) - self._nickname_cache[fingerprint] = nickname + self._relay_cache[fingerprint] = (address, or_port, nickname) - stem.util.log.info('Cached consensus data. Took %0.2fs. Cache size is %s for fingerprints, %s for addresses, and %s for nicknames' % (time.time() - start_time, stem.util.str_tools.size_label(sys.getsizeof(self._fingerprint_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._address_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._nickname_cache)))) + stem.util.log.info('Cached consensus data. Took %0.2fs. Cache size is %s for fingerprints, %s for relays' % (time.time() - start_time, stem.util.str_tools.size_label(sys.getsizeof(self._fingerprint_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._relay_cache)))) controller.add_event_listener(lambda event: self.update(event.desc), stem.control.EventType.NEWCONSENSUS) @@ -848,26 +846,23 @@ class ConsensusTracker(object): """ new_fingerprint_cache = {} - new_address_cache = {} - new_nickname_cache = {} + new_relay_cache = {} start_time = time.time() our_fingerprint = tor_controller().get_info('fingerprint', None) for desc in router_status_entries: new_fingerprint_cache.setdefault(desc.address, []).append((desc.or_port, desc.fingerprint)) - new_address_cache[desc.fingerprint] = (desc.address, desc.or_port) - new_nickname_cache[desc.fingerprint] = desc.nickname + new_relay_cache[desc.fingerprint] = (desc.address, desc.or_port, desc.nickname) if desc.fingerprint == our_fingerprint: self._my_router_status_entry = desc self._my_router_status_entry_time = time.time() self._fingerprint_cache = new_fingerprint_cache - self._address_cache = new_address_cache - self._nickname_cache = new_nickname_cache + self._relay_cache = new_relay_cache - stem.util.log.info('Updated consensus cache. Took %0.2fs. Cache size is %s for fingerprints, %s for addresses, and %s for nicknames' % (time.time() - start_time, stem.util.str_tools.size_label(sys.getsizeof(self._fingerprint_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._address_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._nickname_cache)))) + stem.util.log.info('Updated consensus cache. Took %0.2fs. Cache size is %s for fingerprints, %s for relays' % (time.time() - start_time, stem.util.str_tools.size_label(sys.getsizeof(self._fingerprint_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._relay_cache)))) def my_router_status_entry(self): """ @@ -901,7 +896,7 @@ class ConsensusTracker(object): elif fingerprint == controller.get_info('fingerprint', None): return controller.get_conf('Nickname', 'Unnamed') else: - return self._nickname_cache.get(fingerprint) + return self._relay_cache.get(fingerprint)[2] def get_relay_fingerprints(self, address): """ @@ -941,4 +936,4 @@ class ConsensusTracker(object): if my_address and len(my_or_ports) == 1: return (my_address, my_or_ports[0]) - return self._address_cache.get(fingerprint, default) + return self._relay_cache.get(fingerprint, default)[:2]

1 0

[nyx/master] Log size of cached consensus data
by atagar＠torproject.org 22 Aug '17

22 Aug '17

commit 6d8920436d9ee24f104f591bb48ff176cb7958dd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Aug 20 15:36:12 2017 -0700 Log size of cached consensus data Investigations into nyx memory usage indicate the consensus tracker is more than everything else combined. On initial load ~2.3 MB, and for some reason when update() is called that grows several fold (from 3% total memory usage to 10%). Still investigating, and there's some clear optimizations we can make, but first step is more data. --- nyx/tracker.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nyx/tracker.py b/nyx/tracker.py index 21d5b36..4ac76aa 100644 --- a/nyx/tracker.py +++ b/nyx/tracker.py @@ -52,6 +52,7 @@ Background tasks for gathering information about the tor process. import collections import os +import sys import time import threading @@ -817,6 +818,7 @@ class ConsensusTracker(object): # Stem's get_network_statuses() is slow, and overkill for what we need # here. Just parsing the raw GETINFO response to cut startup time down. + start_time = time.time() controller = tor_controller() ns_response = controller.get_info('ns/all', None) @@ -834,6 +836,8 @@ class ConsensusTracker(object): self._address_cache[fingerprint] = (address, or_port) self._nickname_cache[fingerprint] = nickname + stem.util.log.info('Cached consensus data. Took %0.2fs. Cache size is %s for fingerprints, %s for addresses, and %s for nicknames' % (time.time() - start_time, stem.util.str_tools.size_label(sys.getsizeof(self._fingerprint_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._address_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._nickname_cache)))) + controller.add_event_listener(lambda event: self.update(event.desc), stem.control.EventType.NEWCONSENSUS) def update(self, router_status_entries): @@ -846,6 +850,8 @@ class ConsensusTracker(object): new_fingerprint_cache = {} new_address_cache = {} new_nickname_cache = {} + + start_time = time.time() our_fingerprint = tor_controller().get_info('fingerprint', None) for desc in router_status_entries: @@ -861,6 +867,8 @@ class ConsensusTracker(object): self._address_cache = new_address_cache self._nickname_cache = new_nickname_cache + stem.util.log.info('Updated consensus cache. Took %0.2fs. Cache size is %s for fingerprints, %s for addresses, and %s for nicknames' % (time.time() - start_time, stem.util.str_tools.size_label(sys.getsizeof(self._fingerprint_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._address_cache)), stem.util.str_tools.size_label(sys.getsizeof(self._nickname_cache)))) + def my_router_status_entry(self): """ Provides the router status entry of ourselves. Descriptors are published

1 0

[tor-browser/tor-browser-52.3.0esr-7.5-2] Bug 23230: Fix build error on Windows 64
by gk＠torproject.org 22 Aug '17

22 Aug '17

commit f36d2a2dd30368c97594923092a43dd74c61846c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sat Aug 12 20:42:59 2017 +0200 Bug 23230: Fix build error on Windows 64 Fix the following build error we have when building for Windows 64: /var/tmp/build/firefox-af0ca6a886c7/media/libcubeb/src/cubeb_wasapi.cpp:1596:46: error: cast from cubeb_devid {aka void*} to int loses precision [-fpermissive] We fix that by using %p instead of %x to remove the need for a cast. --- media/libcubeb/src/cubeb_wasapi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/libcubeb/src/cubeb_wasapi.cpp b/media/libcubeb/src/cubeb_wasapi.cpp index e88d6becd861..212cc263c0b6 100644 --- a/media/libcubeb/src/cubeb_wasapi.cpp +++ b/media/libcubeb/src/cubeb_wasapi.cpp @@ -1575,7 +1575,7 @@ int setup_wasapi_stream(cubeb_stream * stm) XASSERT((!stm->output_client || !stm->input_client) && "WASAPI stream already setup, close it first."); if (has_input(stm)) { - LOG("Setup capture: device=%x", (int)stm->input_device); + LOG("Setup capture: device=%p", stm->input_device); rv = setup_wasapi_stream_one_side(stm, &stm->input_stream_params, stm->input_device, @@ -1593,7 +1593,7 @@ int setup_wasapi_stream(cubeb_stream * stm) } if (has_output(stm)) { - LOG("Setup render: device=%x", (int)stm->output_device); + LOG("Setup render: device=%p", stm->output_device); rv = setup_wasapi_stream_one_side(stm, &stm->output_stream_params, stm->output_device,

1 0

[metrics-web/master] Replace § with § in news.json.
by karsten＠torproject.org 22 Aug '17

22 Aug '17

commit 0fc6fd1d9caba5684ccf2e43f3f7f54a12646e3b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 22 10:02:54 2017 +0200 Replace § with § in news.json. --- website/src/main/resources/etc/news.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index 2e8a866..cea9caf 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -169,7 +169,7 @@ "protocols": [ "<OR>" ], - "description": "Coup attempt in Turkey. A paper (§ 4.1) reports a decline in Tor users.", + "description": "Coup attempt in Turkey. A paper (§ 4.1) reports a decline in Tor users.", "links": [ "<a href=\"https://www.usenix.org/conference/foci17/workshop-program/presentation/tana…">paper</a>", "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2016-04-0…">relay graph</a>"

1 0