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

[tor/master] Merge remote-tracking branch 'public/bug13214_025_squashed'
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 593909ea70db9c00d3ae6d3448fb096464e0853d Merge: 71355e1 b10e5ac Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 4 00:24:56 2014 -0500 Merge remote-tracking branch 'public/bug13214_025_squashed' changes/bug13214 | 7 +++++++ src/or/directory.c | 3 ++- src/or/rendcommon.c | 19 +++++++++++++++++++ src/or/rendcommon.h | 1 + 4 files changed, 29 insertions(+), 1 deletion(-)

1 0

[tor/master] Add comments and rename intro_nodes list in rend_services_introduce()
by nickm＠torproject.org 04 Nov '14

04 Nov '14

commit 71355e1db937b0b940bb9510c927e3e500cabc22 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Tue Nov 4 00:19:31 2014 -0500 Add comments and rename intro_nodes list in rend_services_introduce() (No changes file needed: this patch just adds comments and renames variables. This is ticket 13646. message taken from the ticket. -Nick) --- src/or/rendservice.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 392f393..c586132 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3028,15 +3028,16 @@ rend_services_introduce(void) int intro_point_set_changed, prev_intro_nodes; unsigned int n_intro_points_unexpired; unsigned int n_intro_points_to_open; - smartlist_t *intro_nodes; time_t now; const or_options_t *options = get_options(); + /* List of nodes we need to _exclude_ when choosing a new node to establish + * an intro point to. */ + smartlist_t *exclude_nodes = smartlist_new(); - intro_nodes = smartlist_new(); now = time(NULL); for (i=0; i < smartlist_len(rend_service_list); ++i) { - smartlist_clear(intro_nodes); + smartlist_clear(exclude_nodes); service = smartlist_get(rend_service_list, i); tor_assert(service); @@ -3135,8 +3136,10 @@ rend_services_introduce(void) if (intro != NULL && intro->time_expiring == -1) ++n_intro_points_unexpired; + /* Add the valid node to the exclusion list so we don't try to establish + * an introduction point to it again. */ if (node) - smartlist_add(intro_nodes, (void*)node); + smartlist_add(exclude_nodes, (void*)node); } SMARTLIST_FOREACH_END(intro); if (!intro_point_set_changed && @@ -3172,7 +3175,7 @@ rend_services_introduce(void) router_crn_flags_t flags = CRN_NEED_UPTIME|CRN_NEED_DESC; if (get_options()->AllowInvalid_ & ALLOW_INVALID_INTRODUCTION) flags |= CRN_ALLOW_INVALID; - node = router_choose_random_node(intro_nodes, + node = router_choose_random_node(exclude_nodes, options->ExcludeNodes, flags); if (!node) { log_warn(LD_REND, @@ -3183,7 +3186,9 @@ rend_services_introduce(void) break; } intro_point_set_changed = 1; - smartlist_add(intro_nodes, (void*)node); + /* Add the choosen node to the exclusion list in order to avoid to pick + * it again in the next iteration. */ + smartlist_add(exclude_nodes, (void*)node); intro = tor_malloc_zero(sizeof(rend_intro_point_t)); intro->extend_info = extend_info_from_node(node, 0); intro->intro_key = crypto_pk_new(); @@ -3212,7 +3217,7 @@ rend_services_introduce(void) } } } - smartlist_free(intro_nodes); + smartlist_free(exclude_nodes); } /** Regenerate and upload rendezvous service descriptors for all

1 0

[tor-browser-bundle/master] Update version and changelog for Torbutton 1.8.0.1
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit d4351a02e34c07b21c0efa029496e515a5482df8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 20:18:22 2014 -0800 Update version and changelog for Torbutton 1.8.0.1 --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions.alpha | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 376a38b..cac86a7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -7,11 +7,12 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014 * Bug 13460: Fix MSVC compilation issue * Update Tor to 0.2.6.0-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.0.0 + * Update Torbutton to 1.8.0.1 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs + * Bug 13651: Prevent circuit-status related UI hang. * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Include obfs4proxy pluggable transport * Windows diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b84f92e..284c4ef 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build3 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.0.0 +TORBUTTON_TAG=1.8.0.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Bump changelog and version for 1.8.0.1
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit c688cf25b3b8ec5752a6afccdffe2ededb6a1c66 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 19:32:49 2014 -0800 Bump changelog and version for 1.8.0.1 --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0ad0e44..98d3251 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.0.1 + * Bug 13651: Fix hangs associated with circuit status UI from #8641. + 1.8.0.0 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch diff --git a/src/install.rdf b/src/install.rdf index 4148b3c..ae50323 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.0.0</em:version> + <em:version>1.8.0.1</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] fixup! Bug #8641: TorButton popup menu that displays current Tor circuit
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit aeb53cde3f5765e8c5e7062afe9dba5b3fc68b50 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Nov 3 13:38:48 2014 -0800 fixup! Bug #8641: TorButton popup menu that displays current Tor circuit --- src/chrome/content/tor-circuit-display.js | 1 + src/modules/tor-control-port.js | 52 +++++++++++++++++++---------- 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 5f4d8bf..3a1fed8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -41,6 +41,7 @@ let regionBundle = Services.strings.createBundle( // Convert a country code to a localized country name. // Example: `'de'` -> `'Deutschland'` in German locale. let localizedCountryNameFromCode = function (countryCode) { + if (typeof(countryCode) === "undefined") return ""; try { return regionBundle.GetStringFromName(countryCode.toLowerCase()); } catch (e) { diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 2f993d7..855b34b 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -14,12 +14,23 @@ /* jshint esnext: true */ /* jshint -W097 */ -/* global Components, console */ +/* global Components, console, Services */ "use strict"; // ### Mozilla Abbreviations let {classes: Cc, interfaces: Ci, results: Cr, Constructor: CC, utils: Cu } = Components; +// ### Import Mozilla Services +Cu.import("resource://gre/modules/Services.jsm"); + +// ## torbutton logger +let logger = Cc["@torproject.org/torbutton-logger;1"] + .getService(Components.interfaces.nsISupports).wrappedJSObject, + log = x => logger.eclog(3, x); + +// ### announce this file +log("Loading tor-control-port.js\n"); + // ## io // I/O utilities namespace let io = io || {}; @@ -30,12 +41,12 @@ let io = io || {}; io.asyncSocketStreams = function (host, port) { let socketTransportService = Cc["@mozilla.org/network/socket-transport-service;1"] .getService(Components.interfaces.nsISocketTransportService), - BLOCKING = Ci.nsITransport.OPEN_BLOCKING, UNBUFFERED = Ci.nsITransport.OPEN_UNBUFFERED, - // Create an instance of a socket transport. + // Create an instance of a socket transport. socketTransport = socketTransportService.createTransport(null, 0, host, port, null), - // Open unbuffered synchronous outputStream. - outputStream = socketTransport.openOutputStream(BLOCKING | UNBUFFERED, 1, 1), + // Open unbuffered asynchronous outputStream. + outputStream = socketTransport.openOutputStream(UNBUFFERED, 1, 1) + .QueryInterface(Ci.nsIAsyncOutputStream), // Open unbuffered asynchronous inputStream. inputStream = socketTransport.openInputStream(UNBUFFERED, 1, 1) .QueryInterface(Ci.nsIAsyncInputStream); @@ -81,21 +92,28 @@ io.pumpInputStream = function (inputStream, onInputData, onError) { // socket.write(text) and socket.close(). onError will be passed the error object // whenever a write fails. io.asyncSocket = function (host, port, onInputData, onError) { - let [inputStream, outputStream] = io.asyncSocketStreams(host, port); + let [inputStream, outputStream] = io.asyncSocketStreams(host, port), + pendingWrites = []; // Run an input stream pump to send incoming data to the onInputData callback. io.pumpInputStream(inputStream, onInputData, onError); + // Return the "socket object" as described. return { // Write a message to the socket. write : function(aString) { - try { - outputStream.write(aString, aString.length); - // console.log(aString); - } catch (err) { - // This write() method is not necessarily called by a callback, - // but we pass any thrown errors to onError to ensure the socket - // error handling uses a consistent single path. - onError(err); - } + pendingWrites.push(aString); + outputStream.asyncWait( + // Implement an nsIOutputStreamCallback: + { onOutputStreamReady : function () { + let totalString = pendingWrites.join(""); + try { + outputStream.write(totalString, totalString.length); + log("wrote: " + aString + "\n"); + } catch (err) { + onError(err); + } + pendingWrites = []; + } }, + 0, 0, Services.tm.currentThread); }, // Close the socket. close : function () { @@ -146,7 +164,7 @@ io.onLineFromOnMessage = function (onMessage) { pendingLines = []; // Pass multiline message to onMessage. onMessage(message); - // console.log(message); + //log(message); } }; }; @@ -241,7 +259,7 @@ io.controlSocket = function (host, port, password, onError) { // Log in to control port. sendCommand("authenticate " + (password || "")); // Activate needed events. - sendCommand("setevents stream circ"); + sendCommand("setevents circ"); return { close : socket.close, sendCommand : sendCommand, addNotificationCallback : notificationDispatcher.addCallback, removeNotificationCallback : notificationDispatcher.removeCallback };

1 0

[tor-browser-bundle/master] Use the new security.ssl.disable_session_identifiers pref.
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit a609ff09f7ba996ac51da49bdcef3ee796d58959 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 26 19:06:17 2014 +0000 Use the new security.ssl.disable_session_identifiers pref. This is to reenable the TLS session tickets that are disabled by Tor Browser, so the TLS client hello matches that of stock Firefox. https://trac.torproject.org/projects/tor/ticket/13442#comment:1 https://trac.torproject.org/projects/tor/ticket/11183#comment:9 The previously used pref security.enable_tls_session_tickets has been removed and replaced by security.ssl.disable_session_identifiers. https://bugzilla.mozilla.org/show_bug.cgi?id=917049 https://bugzilla.mozilla.org/show_bug.cgi?id=967977 https://trac.torproject.org/projects/tor/ticket/10822 https://gitweb.torproject.org/tor-browser.git/commitdiff/5524ae43780e473831… --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index cddc237..eb94d1d 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -6,8 +6,8 @@ user_pref("browser.dom.window.dump.enabled", true); // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. -// https://trac.torproject.org/projects/tor/ticket/11183#comment:9 -user_pref("security.enable_tls_session_tickets", true); +// https://trac.torproject.org/projects/tor/ticket/13442#comment:1 +user_pref("security.ssl.disable_session_identifiers", false); // Disable safe mode. In case of a crash, we don't want to prompt for a // safe-mode browser that has extensions disabled and no proxy.

1 0

[tor-browser-bundle/master] Update changelog for meek fix.
by mikeperry＠torproject.org 04 Nov '14

04 Nov '14

commit 40721d5393f5247fd1075886244fa77558e35ef2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Nov 3 19:20:37 2014 -0800 Update changelog for meek fix. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 4098fe7..376a38b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -12,6 +12,7 @@ Tor Browser 4.5-alpha-1 -- Nov 3 2014 * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs + * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Include obfs4proxy pluggable transport * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch.

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 03 Nov '14

03 Nov '14

commit afbc8ac7bcc755a27b58c29fc4466a5b0c6d0485 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 3 22:45:48 2014 +0000 Update translations for torbutton-torbuttondtd --- ru/torbutton.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ru/torbutton.dtd b/ru/torbutton.dtd index 38efcd1..3bc9df2 100644 --- a/ru/torbutton.dtd +++ b/ru/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Инициализировать Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Настройки Конфиденциальности и Безопасности"> <!ENTITY torbutton.prefs.block_thread "Блокировать чтение из журнала в режиме Tor (важно)"> <!ENTITY torbutton.prefs.block_thwrite "Блокировать запись в журнал в режиме Tor (желательно)"> <!ENTITY torbutton.prefs.block_nthread "Блокировать чтение из журнала в режиме не-Tor (необяз.)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Блокировать сторонние куки и другие данные слежения"> <!ENTITY torbutton.prefs.block_plugins "Отключить расширения браузера (такие как Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Изменить сведения, отличающие вас от других пользователей Tor Browser"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Уровень Безопасности"> +<!ENTITY torbutton.prefs.sec_low "Низкий (по умолчанию)"> +<!ENTITY torbutton.prefs.sec_med_low "Средне-Низкий"> +<!ENTITY torbutton.prefs.sec_med_high "Средне-Высокий"> +<!ENTITY torbutton.prefs.sec_high "Высокий"> +<!ENTITY torbutton.prefs.sec_custom "Собственные Значения">

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 03 Nov '14

03 Nov '14

commit 15fdd668cfbba095288808432c9c306430074bf6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 3 21:15:42 2014 +0000 Update translations for tails-misc_completed --- tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr.po b/tr.po index 6f8b2d4..eb9a800 100644 --- a/tr.po +++ b/tr.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-10-29 02:00+0000\n" +"PO-Revision-Date: 2014-11-03 21:01+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 03 Nov '14

03 Nov '14

commit 3472d8f0feea922bf468c39e83e16120bc9d7135 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 3 21:15:38 2014 +0000 Update translations for tails-misc --- tr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr.po b/tr.po index 6f8b2d4..eb9a800 100644 --- a/tr.po +++ b/tr.po @@ -17,7 +17,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 17:57+0200\n" -"PO-Revision-Date: 2014-10-29 02:00+0000\n" +"PO-Revision-Date: 2014-11-03 21:01+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/torproject/language/tr/)\n" "MIME-Version: 1.0\n"

1 0