February 2015 - tor-commits - lists.torproject.org

[torbutton/master] Add changelog for 1.9.0.0 + bump version.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit a50335676cb8d62eb255f0ce206b82cb553e0fc5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 12:36:27 2015 -0800 Add changelog for 1.9.0.0 + bump version. --- src/CHANGELOG | 19 +++++++++++++++++++ src/install.rdf | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a3e859e..11fa776 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,22 @@ +1.9.0.0 + * Bug 13882: Fix display of bridges after bridge settings have been changed + * Bug 5698: Use "Tor Browser" branding in "About Tor Browser" dialog + * Bug 10280: Strings and pref for preventing plugin initialization. + * Bug 14866: Show correct circuit when more than one exists for a given domain + * Bug 9442: Add New Circuit button to Torbutton menu + * Bug 9906: Warn users before closing all windows and performing new identity. + * Bug 8400: Prompt for restart if disk records are enabled/disabled. + * Bug 14630: Hide Torbutton's proxy settings tab. + * Bug 14632: Disable Cookie Manager until we get it working. + * Bug 11175: Remove "About Torbutton" from onion menu. + * Bug 13900: Remove SafeCache code. + * Bug 14490: Use Disconnect search in about:tor search box + * Bug 14392: Don't steal input focus in about:tor search box + * Bug 11236: Don't set omnibox order in Torbutton (to prevent translation) + * Bug 13406: Stop directing users to download-easy.html.en on update + * Bug 9387: Handle "custom" mode better in Security Slider + * Bug 12430: Bind jar: pref to Security Slider + 1.8.1.3 * Bug 13998: Handle changes in NoScript 2.6.9.8+ * Bug 14100: Option to hide NetworkSettings menuitem diff --git a/src/install.rdf b/src/install.rdf index e4045ad..b5a8e88 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.3</em:version> + <em:version>1.9.0.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/13882+'
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 3692388e5262cd6a5b9ffcd1a950b04e56933e18 Merge: 7fd169e de8cb7a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 11:41:32 2015 -0800 Merge remote-tracking branch 'arthur/13882+' src/chrome/content/tor-circuit-display.js | 71 ++++++++++------------- src/modules/tor-control-port.js | 88 ++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 60 deletions(-)

1 0

[torbutton/master] Bug #13882: Fix display of bridges after bridge settings have been changed
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit de8cb7a32e0d2a70812322ce1d6a1f4627ef33f0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 16 17:47:13 2015 -0800 Bug #13882: Fix display of bridges after bridge settings have been changed --- src/chrome/content/tor-circuit-display.js | 71 ++++++++++------------- src/modules/tor-control-port.js | 88 ++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 60 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 35a7dfc..e2628b4 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -43,41 +43,23 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}, - // A map from bridge fingerprint to its IP address. - bridgeIDtoIPmap = new Map(); + knownCircuitIDs = {}; // __trimQuotes(s)__. // Removes quotation marks around a quoted string. let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; -// __readBridgeIPs(controller)__. -// Gets a map from bridge ID to bridge IP, and stores it -// in `bridgeIDtoIPmap`. -let readBridgeIPs = function (controller) { - Task.spawn(function* () { - let configText = yield controller.getInfo("config-text"), - bridgeEntries = configText.Bridge; - if (bridgeEntries) { - bridgeEntries.map(entry => { - let IPplusPort, ID, - tokens = entry.split(/\s+/); - // First check if we have a "vanilla" bridge: - if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { - [IPplusPort, ID] = tokens; - // Several bridge types have a similar format: - } else if (["fte", "obfs3", "obfs4", "scramblesuit"] - .indexOf(tokens[0]) >= 0) { - [IPplusPort, ID] = tokens.slice(1); - } - // (For now, we aren't dealing with meek bridges and flashproxy.) - if (IPplusPort && ID) { - let IP = IPplusPort.split(":")[0]; - bridgeIDtoIPmap.set(ID.toUpperCase(), IP); - } - }); +// __getBridge(id)__. +// Gets the bridge parameters for a given node ID. If the node +// is not currently used as a bridge, returns null. +let getBridge = function* (controller, id) { + let bridges = yield controller.getConf("bridge"); + for (let bridge of bridges) { + if (bridge.ID.toUpperCase() === id.toUpperCase()) { + return bridge; } - }).then(null, Cu.reportError); + } + return null; }; // nodeDataForID(controller, id)__. @@ -85,17 +67,22 @@ let readBridgeIPs = function (controller) { // Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` // => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` let nodeDataForID = function* (controller, id) { - let result = {}; // type, ip, countryCode; - if (bridgeIDtoIPmap.has(id.toUpperCase())) { - result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); + let result = {}, + bridge = yield getBridge(controller, id); // type, ip, countryCode; + if (bridge) { result.type = "bridge"; - } else { - // Get the IP address for the given node ID. + result.bridgeType = bridge.type; + // Attempt to get an IP address from bridge address string. try { - let statusMap = yield controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; + result.ip = bridge.address.split(":")[0]; } catch (e) { } + } else { result.type = "default"; + // Get the IP address for the given node ID. + try { + let statusMap = yield controller.getInfo("ns/id/" + id); + result.ip = statusMap.IP; + } catch (e) { } } if (result.ip) { // Get the country code for the node's IP address. @@ -141,8 +128,10 @@ let collectIsolationData = function (aController) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), - credentials = trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + - trimQuotes(circuitStatus.SOCKS_PASSWORD); + credentials = circuitStatus ? + (trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : + null; if (credentials) { let nodeData = yield nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; @@ -195,11 +184,12 @@ let showCircuitDisplay = function (show) { // `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { let result = [uiString("this_browser")]; - for (let {ip, countryCode, type} of nodeData) { + for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; result.push((countryCode ? localizedCountryNameFromCode(countryCode) : uiString("unknown_country")) + - " (" + (bridge ? uiString("tor_bridge") + " (" + (bridge ? (uiString("tor_bridge") + + ((bridgeType !== "vanilla") ? (": " + bridgeType) : "")) : (ip || uiString("ip_unknown"))) + ")"); } result[4] = uiString("internet"); @@ -340,7 +330,6 @@ let setupDisplay = function (host, port, password, enablePrefName) { logger.eclog(5, "Disabling tor display circuit because of an error."); stop(); }); - readBridgeIPs(myController); syncDisplayWithSelectedTab(true); collectIsolationData(myController); } diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 3fa7756..a55a0d8 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -372,22 +372,22 @@ utils.listMapData = function (parameterString, listNames) { }; // ## info -// A namespace for functions related to tor's GETINFO command. +// A namespace for functions related to tor's GETINFO and GETCONF command. let info = info || {}; // __info.keyValueStringsFromMessage(messageText)__. -// Takes a message (text) response to GETINFO and provides a series of key-value -// strings, which are either multiline (with a `250+` prefix): +// Takes a message (text) response to GETINFO or GETCONF and provides +// a series of key-value strings, which are either multiline (with a `250+` prefix): // // 250+config/defaults= // AccountingMax "0 bytes" // AllowDotExit "0" // . // -// or single-line (with a `250-` prefix): +// or single-line (with a `250-` or `250 ` prefix): // // 250-version=0.2.6.0-alpha-dev (git-b408125288ad6943) -info.keyValueStringsFromMessage = utils.extractor(/^(250\+[\s\S]+?^\.|250-.+?)$/gmi); +info.keyValueStringsFromMessage = utils.extractor(/^(250\+[\s\S]+?^\.|250[-\ ].+?)$/gmi); // __info.applyPerLine(transformFunction)__. // Returns a function that splits text into lines, @@ -462,9 +462,33 @@ info.configTextParser = function(text) { return result; }; + +// __info.bridgeParser(bridgeLine)__. +// Takes a single line from a `getconf bridge` result and returns +// a map containing the bridge's type, address, and ID. +info.bridgeParser = function(bridgeLine) { + let result = {}, + tokens = bridgeLine.split(/\s+/); + // First check if we have a "vanilla" bridge: + if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { + result.type = "vanilla"; + [result.address, result.ID] = tokens; + // Several bridge types have a similar format: + } else { + result.type = tokens[0]; + if (["fte", "obfs3", "obfs4", "scramblesuit"] + .indexOf(result.type) >= 0) { + [result.address, result.ID] = tokens.slice(1); + } else if (result.type === "meek") { + // do nothing for now + } + } + return result.type ? result : null; +}; + // __info.parsers__. -// A map of GETINFO keys to parsing function, which convert result strings to JavaScript -// data. +// A map of GETINFO and GETCONF keys to parsing function, which convert +// result strings to JavaScript data. info.parsers = { "version" : utils.identity, "config-file" : utils.identity, @@ -474,7 +498,8 @@ info.parsers = { "ns/name/" : info.routerStatusParser, "ip-to-country/" : utils.identity, "circuit-status" : info.applyPerLine(info.circuitStatusParser), - "stream-status" : info.applyPerLine(info.streamStatusParser) + "stream-status" : info.applyPerLine(info.streamStatusParser), + "bridge" : info.bridgeParser }; // __info.getParser(key)__. @@ -482,22 +507,37 @@ info.parsers = { // convert its corresponding valueString to JavaScript data. info.getParser = function(key) { return info.parsers[key] || - info.parsers[key.substring(0, key.lastIndexOf("/") + 1)] || - "unknown"; + info.parsers[key.substring(0, key.lastIndexOf("/") + 1)]; }; // __info.stringToValue(string)__. -// Converts a key-value string as from GETINFO to a value. +// Converts a key-value string as from GETINFO or GETCONF to a value. info.stringToValue = function (string) { // key should look something like `250+circuit-status=` or `250-circuit-status=...` - let key = string.match(/^250[\+-](.+?)=/mi)[1], - // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. - matchResult = string.match(/250\-.+?=(.*?)$/mi) || + // or `250 circuit-status...` + let matchForKey = string.match(/^250[ +-](.+?)=/mi), + key = matchForKey ? matchForKey[1] : null; + if (key === null) return null; + // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. + let matchResult = string.match(/250[ -].+?=(.*?)$/mi) || string.match(/250\+.+?=([\s\S]*?)^\.$/mi), // Retrieve the captured group (the text of the value in the key-value pair) - valueString = matchResult ? matchResult[1] : null; - // Return value where the latter has been parsed according to the key requested. - return info.getParser(key)(valueString); + valueString = matchResult ? matchResult[1] : null, + // Get the parser functino for the key found. + parse = info.getParser(key.toLowerCase()); + if (parse === undefined) { + throw new Error("No parser found for '" + key + "'"); + } + // Return value produced by the parser. + return parse(valueString); +}; + +// __info.getMultipleResponseValues(message)__. +// Process multiple responses to a GETINFO or GETCONF request. +info.getMultipleResponseValues = function (message) { + return info.keyValueStringsFromMessage(message) + .map(info.stringToValue) + .filter(utils.identity); }; // __info.getInfoMultiple(aControlSocket, keys)__. @@ -519,8 +559,7 @@ info.getInfoMultiple = function (aControlSocket, keys) { } */ return aControlSocket.sendCommand("getinfo " + keys.join(" ")) - .then(message => info.keyValueStringsFromMessage(message) - .map(info.stringToValue)); + .then(info.getMultipleResponseValues); }; // __info.getInfo(controlSocket, key)__. @@ -537,6 +576,16 @@ info.getInfo = function (aControlSocket, key) { return info.getInfoMultiple(aControlSocket, [key]).then(data => data[0]); }; +// __info.getConf(aControlSocket, key)__. +// Sends GETCONF for a single key. Returns a promise with the result. +info.getConf = function (aControlSocket, key) { + // GETCONF with a single argument returns results that look like + // results from GETINFO with multiple arguments. + // So we can use the same kind of parsing for + return aControlSocket.sendCommand("getconf " + key) + .then(info.getMultipleResponseValues); +}; + // ## event // Handlers for events @@ -587,6 +636,7 @@ tor.controller = function (host, port, password, onError) { isOpen = true; return { getInfo : key => info.getInfo(socket, key), getInfoMultiple : keys => info.getInfoMultiple(socket, keys), + getConf : key => info.getConf(socket, key), watchEvent : function (type, filter, onData) { event.watchEvent(socket, type, filter, onData); },

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 9a5a1cec6b3449c1f5f3706823ec5b1ff31e40d0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 14:21:49 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. It turns out that the fix for #11236 still contains too much randomnees for our taste if more than two search engines are specified to be on the top. Fall back to just two. --- browser/app/profile/000-tor-browser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cb59517..ceb9394 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -153,11 +153,11 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\" pref("browser.search.defaultenginename", "Search"); // Search engine order (order displayed in the search bar dropdown) -// Somewhat surprisingly we get Disconnect - YouTube - Twitter as the order -// only if we set them as below. -pref("browser.search.order.extra.1", "YouTube"); -pref("browser.search.order.extra.2", "Twitter"); -pref("browser.search.order.extra.3", "Search"); +// Somewhat surprisingly we get some random behavior if we specify more than +// two search engines as below. See +// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. +pref("browser.search.order.extra.1", "Search"); +pref("browser.search.order.extra.2", "YouTube"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor/master] Downgrade new extrainfo_insert warnings on startup
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit b7b8b9ecf916992071993002301141c4c5d8f56f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 18 13:41:00 2015 -0500 Downgrade new extrainfo_insert warnings on startup --- src/or/routerlist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 987f3a8..a0437ce 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2840,6 +2840,7 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) signed_descriptor_t *sd = sdmap_get(rl->desc_by_eid_map, ei->cache_info.signed_descriptor_digest); extrainfo_t *ei_tmp; + const int severity = warn_if_incompatible ? LOG_WARN : LOG_INFO; { extrainfo_t *ei_generated = router_get_my_extrainfo(); @@ -2856,7 +2857,7 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) * This just won't work. */; static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); r = ROUTER_BAD_EI; - log_fn_ratelim(&no_sd_ratelim, LOG_WARN, LD_BUG, + log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG, "No entry found in extrainfo map."); goto done; } @@ -2866,14 +2867,13 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) /* The sd we got from the map doesn't match the digest we used to look * it up. This makes no sense. */ r = ROUTER_BAD_EI; - log_fn_ratelim(&digest_mismatch_ratelim, LOG_WARN, LD_BUG, - "Mismatch in digest in extrainfo map."); + log_fn_ratelim(&digest_mismatch_ratelim, severity, LD_BUG, + "Mismatch in digest in extrainfo map."); goto done; } if (routerinfo_incompatible_with_extrainfo(ri, ei, sd, &compatibility_error_msg)) { char d1[HEX_DIGEST_LEN+1], d2[HEX_DIGEST_LEN+1]; - const int severity = warn_if_incompatible ? LOG_WARN : LOG_INFO; r = (ri->cache_info.extrainfo_is_bogus) ? ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS;

1 0

[tor/master] Reflow changelog
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit bb740af87dfaf1bba51cad2ad2e24d18a683f6ff Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 18 13:32:41 2015 -0500 Reflow changelog --- ChangeLog | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e3b758..83c7dbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,17 +147,6 @@ Changes in version 0.2.6.3-alpha - 2015-02-?? - Elevate authorized-client message from DEBUG to INFO. Closes ticket 14015. - o Minor bugfixes (path counting): - - When deciding whether we have any exit nodes, count the number listed - in the consensus, not the number we have descriptors for. Fixes part - of bug 14918; bugfix on 0.2.6.2-alpha. - - Do not warn that we are missing directory information if we have - decided not to fetch directory information due to a long period - of idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha. - - When deciding whether we have any exit nodes, only do processing for - ExitNodes when the ExitNodes option is actually set. Fixes part of - bug 14918; bugfix on 0.2.6.2-alpha. - o Minor features (relay): - Use separate minimum bandwidth values for the configurations of relays and bridges. Raise the minimum configured bandwidth for @@ -303,6 +292,17 @@ Changes in version 0.2.6.3-alpha - 2015-02-?? case we change the Tor versioning system in the future. Fixes bug 13661; bugfix on 0.0.8pre1. + o Minor bugfixes (path counting): + - When deciding whether we have any exit nodes, count the number + listed in the consensus, not the number we have descriptors for. + Fixes part of bug 14918; bugfix on 0.2.6.2-alpha. + - Do not warn that we are missing directory information if we have + decided not to fetch directory information due to a long period of + idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha. + - When deciding whether we have any exit nodes, only do processing + for ExitNodes when the ExitNodes option is actually set. Fixes + part of bug 14918; bugfix on 0.2.6.2-alpha. + o Minor bugfixes (portability): - Fix the ioctl()-based network interface lookup code so that it will work on systems that have variable-length struct ifreq, for

1 0

[tor/master] merge new items into 0.2.6.3-alpha changelog
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit c2312f4f5fbc37581180f53fb67edb70f3360104 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 18 13:32:11 2015 -0500 merge new items into 0.2.6.3-alpha changelog --- ChangeLog | 17 +++++++++++++++++ changes/bug14918 | 15 --------------- changes/bug9321 | 7 ------- changes/feature13822 | 5 ----- 4 files changed, 17 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62502ec..9e3b758 100644 --- a/ChangeLog +++ b/ChangeLog @@ -147,6 +147,23 @@ Changes in version 0.2.6.3-alpha - 2015-02-?? - Elevate authorized-client message from DEBUG to INFO. Closes ticket 14015. + o Minor bugfixes (path counting): + - When deciding whether we have any exit nodes, count the number listed + in the consensus, not the number we have descriptors for. Fixes part + of bug 14918; bugfix on 0.2.6.2-alpha. + - Do not warn that we are missing directory information if we have + decided not to fetch directory information due to a long period + of idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha. + - When deciding whether we have any exit nodes, only do processing for + ExitNodes when the ExitNodes option is actually set. Fixes part of + bug 14918; bugfix on 0.2.6.2-alpha. + + o Minor features (relay): + - Use separate minimum bandwidth values for the configurations of + relays and bridges. Raise the minimum configured bandwidth for + bridges to 50 KiB/sec and for relays to 75 KiB/sec. (The old + values were 20 KiB/sec.) Closes ticket 13822. + o Minor features (stability): - Prevent bugs from causing infinite loops in our hash-table iteration code by adding assertions that cached hash values have diff --git a/changes/bug14918 b/changes/bug14918 deleted file mode 100644 index 6edd425..0000000 --- a/changes/bug14918 +++ /dev/null @@ -1,15 +0,0 @@ - o Minor bugfixes (path counting): - - When deciding whether we have any exit nodes, count the number listed - in the consensus, not the number we have descriptors for. Fixes part - of bug 14918; bugfix on 0.2.6.2-alpha. - - Do not warn that we are missing directory information if we have - decided not to fetch directory information due to a long period - of idleness. Fixes part of bug 14918; bugfix on 0.2.6.2-alpha. - - When deciding whether we have any exit nodes, only do processing for - ExitNodes when the ExitNodes option is actually set. Fixes part of - bug 14918; bugfix on 0.2.6.2-alpha. - - o Minor bugfixes (logging during bootstrap): - - Correctly update and log the amount of directory information that - has been fetched during the bootstrap process. Fixes part of bug - 14918; bugfix on 0.2.6.2-alpha. diff --git a/changes/bug9321 b/changes/bug9321 deleted file mode 100644 index 9826084..0000000 --- a/changes/bug9321 +++ /dev/null @@ -1,7 +0,0 @@ - o Major features: - - Introduce the Guardfraction feature which improves the load - balancing of path selection towards guard nodes. Specifically, - it aims to reduce the traffic gap that guard nodes experience - when they first get the Guard flag. This is a required step if - we want to increase the guard lifetime to 9 months or greater. - Resolves ticket 9321. diff --git a/changes/feature13822 b/changes/feature13822 deleted file mode 100644 index 86ed0b8..0000000 --- a/changes/feature13822 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Use separate minimum bandwidth values for the configurations of - relays and bridges. Raise the minimum configured bandwidth for - bridges to 50 KiB/sec and for relays to 75 KiB/sec. (The old - values were 20 KiB/sec.) Closes ticket 13822.

1 0

[tor/master] Improve log messages for diagnosing 13762
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit e65fe0a747dea4b39c409d62b926fe175c3d0caa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 18 13:05:15 2015 -0500 Improve log messages for diagnosing 13762 --- src/or/routerlist.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d53265c..987f3a8 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2851,15 +2851,38 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)) r = ROUTER_NOT_IN_CONSENSUS; goto done; } + if (! sd) { + /* The extrainfo router doesn't have a known routerdesc to attach it to. + * This just won't work. */; + static ratelim_t no_sd_ratelim = RATELIM_INIT(1800); + r = ROUTER_BAD_EI; + log_fn_ratelim(&no_sd_ratelim, LOG_WARN, LD_BUG, + "No entry found in extrainfo map."); + goto done; + } + if (tor_memneq(ei->cache_info.signed_descriptor_digest, + sd->extra_info_digest, DIGEST_LEN)) { + static ratelim_t digest_mismatch_ratelim = RATELIM_INIT(1800); + /* The sd we got from the map doesn't match the digest we used to look + * it up. This makes no sense. */ + r = ROUTER_BAD_EI; + log_fn_ratelim(&digest_mismatch_ratelim, LOG_WARN, LD_BUG, + "Mismatch in digest in extrainfo map."); + goto done; + } if (routerinfo_incompatible_with_extrainfo(ri, ei, sd, &compatibility_error_msg)) { + char d1[HEX_DIGEST_LEN+1], d2[HEX_DIGEST_LEN+1]; const int severity = warn_if_incompatible ? LOG_WARN : LOG_INFO; r = (ri->cache_info.extrainfo_is_bogus) ? ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS; + base16_encode(d1, sizeof(d1), ri->cache_info.identity_digest, DIGEST_LEN); + base16_encode(d2, sizeof(d2), ei->cache_info.identity_digest, DIGEST_LEN); + log_fn(severity,LD_DIR, - "router info incompatible with extra info (reason: %s)", - compatibility_error_msg); + "router info incompatible with extra info (ri id: %s, ei id %s, " + "reason: %s)", d1, d2, compatibility_error_msg); goto done; } @@ -4637,7 +4660,7 @@ update_extrainfo_downloads(time_t now) smartlist_t *wanted; digestmap_t *pending; int old_routers, i, max_dl_per_req; - int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0; + int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0, n_bogus[2] = {0,0}; if (! options->DownloadExtraInfo) return; if (should_delay_dir_fetches(options, NULL)) @@ -4682,6 +4705,10 @@ update_extrainfo_downloads(time_t now) ++n_pending; continue; } + if (router_get_by_extrainfo_digest(d) != sd) { + ++n_bogus[old_routers]; + continue; + } smartlist_add(wanted, d); } } @@ -4691,6 +4718,14 @@ update_extrainfo_downloads(time_t now) "with present ei, %d delaying, %d pending, %d downloadable.", n_no_ei, n_have, n_delay, n_pending, smartlist_len(wanted)); + if (n_bogus[0] || n_bogus[1]) { + static ratelim_t bogus_ei_warning = RATELIM_INIT(1800); + log_fn_ratelim(&bogus_ei_warning, LOG_WARN, LD_BUG, + "While downloading extrainfo documents, I found %d " + "inconsistencies in routers and %d inconsistencies in " + "old_routers.", n_bogus[0], n_bogus[1]); + } + smartlist_shuffle(wanted); max_dl_per_req = max_dl_per_request(options, DIR_PURPOSE_FETCH_EXTRAINFO);

1 0

[tor/master] Merge branch 'bug13762_diagnostic_redux'
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit a767b6664059c1688f3d8e58c1cded367791e97f Merge: d3f714d e65fe0a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 18 13:29:12 2015 -0500 Merge branch 'bug13762_diagnostic_redux' src/or/routerlist.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-)

1 0

[tor/master] Patch from cypherpunks to try to diagnose 8387.
by nickm＠torproject.org 19 Feb '15

19 Feb '15

commit d3f714deb86a021e6045f3d8451da5d8b06a9b4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 18 13:25:01 2015 -0500 Patch from cypherpunks to try to diagnose 8387. --- src/or/circuituse.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c463b0a..e11242a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -845,12 +845,14 @@ circuit_log_ancient_one_hop_circuits(int age) } log_notice(LD_HEARTBEAT, " #%d created at %s. %s, %s. %s for close. " + "Package window: %d. " "%s for new conns. %s.", ocirc_sl_idx, created, circuit_state_to_string(circ->state), circuit_purpose_to_string(circ->purpose), circ->marked_for_close ? "Marked" : "Not marked", + circ->package_window, ocirc->unusable_for_new_conns ? "Not usable" : "usable", dirty); tor_free(dirty); @@ -866,12 +868,18 @@ circuit_log_ancient_one_hop_circuits(int age) log_notice(LD_HEARTBEAT, " Stream#%d created at %s. " "%s conn in state %s. " + "It is %slinked and %sreading from a linked connection %p. " + "Package window %d. " "%s for close (%s:%d). Hold-open is %sset. " "Has %ssent RELAY_END. %s on circuit.", stream_num, stream_created, conn_type_to_string(c->type), conn_state_to_string(c->type, c->state), + c->linked ? "" : "not ", + c->reading_from_linked_conn ? "": "not", + c->linked_conn, + conn->package_window, c->marked_for_close ? "Marked" : "Not marked", c->marked_for_close_file ? c->marked_for_close_file : "--", c->marked_for_close,

1 0