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

[tor-browser/tor-browser-68.2.0esr-9.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gk＠torproject.org 25 Nov '19

25 Nov '19

commit 8f2ba127875371bfa707525d0778942587daf87c Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Oct 21 18:27:13 2019 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- browser/base/content/browser.xul | 1 - mobile/android/chrome/content/browser.xul | 1 - 2 files changed, 2 deletions(-) diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 6a81cc8c0f72..8e47fd36fb75 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -102,7 +102,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); - Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton_util.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/tor-circuit-display.js", this); Services.scriptloader.loadSubScript("chrome://torbutton/content/torbutton.js", this); diff --git a/mobile/android/chrome/content/browser.xul b/mobile/android/chrome/content/browser.xul index fab93922a5f6..039599131f17 100644 --- a/mobile/android/chrome/content/browser.xul +++ b/mobile/android/chrome/content/browser.xul @@ -12,7 +12,6 @@ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> <script type="application/javascript" src="chrome://browser/content/browser.js"/> - <script type="application/javascript" src="chrome://torbutton/content/torbutton_util.js"/> <script type="application/javascript" src="chrome://torbutton/content/torbutton.js"/> <deck id="browsers" flex="1"/>

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 25 Nov '19

25 Nov '19

commit 2567aea9d07db838cb31ba8c8d1c05613de32f16 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 14:50:14 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index a6f08d29e..f0b65b514 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -749,6 +749,9 @@ msgid "" "bridges by Internet scanning. obfs4 bridges are less likely to be blocked " "than its predecessor, obfs3 bridges." msgstr "" +"obfs4 faz com que o trafego Tor pareça aleatório, e também previne sensores " +"a descobrir pontes através escaneamentos. Pontes obfs4 são menos propensas a" +" serem bloqueadas do que seu antecessor, as pontes obfs3. " #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -767,6 +770,9 @@ msgid "" "instead of using Tor. meek-azure makes it look like you are using a " "Microsoft web site." msgstr "" +"Transportes meek fazem parecer que você está navegando nos principais web " +"sites ao invés do Tor. Meek-azure faz parecer que você está acessando algum " +"web site da Microsoft." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[torbutton/master] Bug 30888: move torbutton_util.js to modules/utils.js
by gk＠torproject.org 25 Nov '19

25 Nov '19

commit ed3fafebab28d005e22208aa921e5f5c7c54153f Author: Alex Catarineu <acat(a)torproject.org> Date: Mon Jun 17 19:16:47 2019 +0200 Bug 30888: move torbutton_util.js to modules/utils.js --- chrome/content/preferences.xhtml | 1 - chrome/content/tor-circuit-display.js | 9 +--- chrome/content/torbutton.js | 32 +++++++------- chrome/content/torbutton_util.js | 79 ----------------------------------- components/external-app-blocker.js | 16 +++---- modules/utils.js | 54 +++++++++++++++++++++++- 6 files changed, 80 insertions(+), 111 deletions(-) diff --git a/chrome/content/preferences.xhtml b/chrome/content/preferences.xhtml index 6f662f5f..eafbf01e 100644 --- a/chrome/content/preferences.xhtml +++ b/chrome/content/preferences.xhtml @@ -6,7 +6,6 @@ <title>&torbutton.prefs.security_settings;</title> <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/> <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/> - <script type="text/javascript" src="torbutton_util.js"></script> <script type="text/javascript" src="preferences-mobile.js"></script> <style> </style> diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 1e58b2b4..19b55d18 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -32,7 +32,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); let { controller } = ChromeUtils.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit, observe, getLocale, getDomainForBrowser } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe, getLocale, getDomainForBrowser, torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -204,15 +204,10 @@ let collectBrowserCredentials = function () { // ## User interface -// __torbuttonBundle__. -// Bundle of localized strings for torbutton UI. -let torbuttonBundle = Services.strings.createBundle( - "chrome://torbutton/locale/torbutton.properties"); - // __uiString__. // Read the localized strings for this UI. let uiString = function (shortName) { - return torbuttonBundle.GetStringFromName("torbutton.circuit_display." + shortName); + return torbutton_get_property_string("torbutton.circuit_display." + shortName); }; // __localizedCountryNameFromCode(countryCode)__. diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index e75584cf..0ca37789 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -1,3 +1,9 @@ +// window globals +var torbutton_init; +var torbutton_new_circuit; +var torbutton_new_identity; + +(() => { // Bug 1506 P1-P5: This is the main Torbutton overlay file. Much needs to be // preserved here, but in an ideal world, most of this code should perhaps be // moved into an XPCOM service, and much can also be tossed. See also @@ -7,18 +13,20 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -/* global torbutton_log, gBrowser, torbutton_safelog, CustomizableUI, - createTorCircuitDisplay, torbutton_get_property_string, gFindBarInitialized, - gFindBar, OpenBrowserWindow, PrivateBrowsingUtils, torbutton_get_stringbundle, +/* global gBrowser, CustomizableUI, + createTorCircuitDisplay, gFindBarInitialized, + gFindBar, OpenBrowserWindow, PrivateBrowsingUtils, Services, AppConstants */ let { - showDialog, show_torbrowser_manual, unescapeTorString, bindPrefAndInit, getDomainForBrowser, + torbutton_safelog, + torbutton_log, + torbutton_get_property_string, } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = ChromeUtils.import("resource://torbutton/modules/security-prefs.js", {}); let { configureControlPortModule } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); @@ -32,15 +40,10 @@ var m_tb_prefs = Services.prefs; // status var m_tb_wasinited = false; -var m_tb_plugin_string = false; var m_tb_is_main_window = false; -var m_tb_hidden_browser = false; var m_tb_confirming_plugins = false; -var m_tb_window_height = window.outerHeight; -var m_tb_window_width = window.outerWidth; - var m_tb_control_ipc_file = null; // Set if using IPC (UNIX domain socket). var m_tb_control_port = null; // Set if using TCP. var m_tb_control_host = null; // Set if using TCP. @@ -232,7 +235,7 @@ function torbutton_is_mobile() { // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. -function torbutton_init() { +torbutton_init = function() { torbutton_log(3, 'called init()'); SecurityPrefs.initialize(); @@ -746,7 +749,7 @@ function torbutton_send_ctrl_cmd(command) { } // Bug 1506 P4: Needed for New IP Address -function torbutton_new_circuit() { +torbutton_new_circuit = function() { let firstPartyDomain = getDomainForBrowser(gBrowser.selectedBrowser); let domainIsolator = Cc["@torproject.org/domain-isolator;1"] @@ -758,7 +761,7 @@ function torbutton_new_circuit() { } // Bug 1506 P4: Needed for New Identity. -async function torbutton_new_identity() { +torbutton_new_identity = async function() { try { // Make sure that we can only click once on New Identiy to avoid race // conditions leading to failures (see bug 11783 for an example). @@ -1720,9 +1723,6 @@ function torbutton_new_window(event) return; } - m_tb_window_height = window.outerHeight; - m_tb_window_width = window.outerWidth; - if (!m_tb_wasinited) { torbutton_init(); } @@ -1906,5 +1906,5 @@ function torbutton_init_user_manual_links() { torbutton_abouttor_message_handler.updateAllOpenPages(); }); } - +})(); //vim:set ts=4 diff --git a/chrome/content/torbutton_util.js b/chrome/content/torbutton_util.js deleted file mode 100644 index e6446cde..00000000 --- a/chrome/content/torbutton_util.js +++ /dev/null @@ -1,79 +0,0 @@ -// Bug 1506 P1-P3: These utility functions might be useful, but -// you probably just want to rewrite them or use the underlying -// code directly. I don't see any of them as essential for 1506, -// really. - -var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"] -.getService(Ci.nsISupports).wrappedJSObject; - -var m_tb_string_bundle = torbutton_get_stringbundle(); - -function torbutton_safelog(nLevel, sMsg, scrub) { - m_tb_torlog.safe_log(nLevel, sMsg, scrub); - return true; -} - -function torbutton_log(nLevel, sMsg) { - m_tb_torlog.log(nLevel, sMsg); - - // So we can use it in boolean expressions to determine where the - // short-circuit is.. - return true; -} - -// get a preferences branch object -// FIXME: this is lame. -function torbutton_get_prefbranch(branch_name) { - var o_prefs = false; - var o_branch = false; - - torbutton_log(1, "called get_prefbranch()"); - o_prefs = Services.prefs; - if (!o_prefs) { - torbutton_log(5, "Failed to get preferences-service!"); - return false; - } - - o_branch = o_prefs.getBranch(branch_name); - if (!o_branch) - { - torbutton_log(5, "Failed to get prefs branch!"); - return false; - } - - return o_branch; -} - -// load localization strings -function torbutton_get_stringbundle() -{ - var o_stringbundle = false; - - try { - var oBundle = Services.strings; - o_stringbundle = oBundle.createBundle("chrome://torbutton/locale/torbutton.properties"); - } catch(err) { - o_stringbundle = false; - } - if (!o_stringbundle) { - torbutton_log(5, 'ERROR (init): failed to find torbutton-bundle'); - } - - return o_stringbundle; -} - -function torbutton_get_property_string(propertyname) -{ - try { - if (!m_tb_string_bundle) { - m_tb_string_bundle = torbutton_get_stringbundle(); - } - - return m_tb_string_bundle.GetStringFromName(propertyname); - } catch(e) { - torbutton_log(4, "Unlocalized string "+propertyname); - } - - return propertyname; -} - diff --git a/components/external-app-blocker.js b/components/external-app-blocker.js index afd5c002..9d5cbd79 100644 --- a/components/external-app-blocker.js +++ b/components/external-app-blocker.js @@ -16,6 +16,8 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { PromptUtils } = ChromeUtils.import("resource://gre/modules/SharedPromptUtils.jsm"); +let { torbutton_get_property_string } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); + // Module specific constants const kMODULE_NAME = "Torbutton External App Handler"; const kCONTRACT_ID = "@torproject.org/torbutton-extAppBlocker;1"; @@ -82,13 +84,13 @@ ExternalAppBlocker.prototype = parentWin = Services.wm.getMostRecentWindow("navigator:browser"); } - let title = parentWin.torbutton_get_property_string("torbutton.popup.external.title"); - let app = parentWin.torbutton_get_property_string("torbutton.popup.external.app"); - let note = parentWin.torbutton_get_property_string("torbutton.popup.external.note"); - let suggest = parentWin.torbutton_get_property_string("torbutton.popup.external.suggest"); - let launch = parentWin.torbutton_get_property_string("torbutton.popup.launch"); - let cancel = parentWin.torbutton_get_property_string("torbutton.popup.cancel"); - let dontask = parentWin.torbutton_get_property_string("torbutton.popup.dontask"); + let title = torbutton_get_property_string("torbutton.popup.external.title"); + let app = torbutton_get_property_string("torbutton.popup.external.app"); + let note = torbutton_get_property_string("torbutton.popup.external.note"); + let suggest = torbutton_get_property_string("torbutton.popup.external.suggest"); + let launch = torbutton_get_property_string("torbutton.popup.launch"); + let cancel = torbutton_get_property_string("torbutton.popup.cancel"); + let dontask = torbutton_get_property_string("torbutton.popup.dontask"); let args = { promptType: "confirmEx", diff --git a/modules/utils.js b/modules/utils.js index 0caf475f..b726342b 100644 --- a/modules/utils.js +++ b/modules/utils.js @@ -239,6 +239,58 @@ var getDomainForBrowser = (browser) => { return fpd; }; +var m_tb_torlog = Cc["@torproject.org/torbutton-logger;1"] +.getService(Ci.nsISupports).wrappedJSObject; + +var m_tb_string_bundle = torbutton_get_stringbundle(); + +function torbutton_safelog(nLevel, sMsg, scrub) { + m_tb_torlog.safe_log(nLevel, sMsg, scrub); + return true; +} + +function torbutton_log(nLevel, sMsg) { + m_tb_torlog.log(nLevel, sMsg); + + // So we can use it in boolean expressions to determine where the + // short-circuit is.. + return true; +} + +// load localization strings +function torbutton_get_stringbundle() +{ + var o_stringbundle = false; + + try { + var oBundle = Services.strings; + o_stringbundle = oBundle.createBundle("chrome://torbutton/locale/torbutton.properties"); + } catch(err) { + o_stringbundle = false; + } + if (!o_stringbundle) { + torbutton_log(5, 'ERROR (init): failed to find torbutton-bundle'); + } + + return o_stringbundle; +} + +function torbutton_get_property_string(propertyname) +{ + try { + if (!m_tb_string_bundle) { + m_tb_string_bundle = torbutton_get_stringbundle(); + } + + return m_tb_string_bundle.GetStringFromName(propertyname); + } catch(e) { + torbutton_log(4, "Unlocalized string "+propertyname); + } + + return propertyname; +} + // Export utility functions for external use. let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", "getDomainForBrowser", - "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString"]; + "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString", + "torbutton_safelog", "torbutton_log", "torbutton_get_property_string"];

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 25 Nov '19

25 Nov '19

commit 413d234ab78e3b31900063136672450eb8de680d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 25 13:50:18 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 45ce05f3a..a6f08d29e 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -694,6 +694,9 @@ msgid "" "Tor Browser includes some circumvention tools for getting around these " "blocks. These tools are called “pluggable transports”." msgstr "" +"O Navegador Tor tem incluídas algumas ferramentas de evasão para contornar " +"esses bloqueios. Essas ferramentas são denominadas \"transportes " +"plugáveis\"." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -930,7 +933,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "* Use MOAT to fetch bridges from within Tor Browser." -msgstr "" +msgstr "* Usar MOAT para obter bridges dentro do Navegador Tor." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -965,6 +968,8 @@ msgid "" "Then, select 'Request a bridge from torproject.org' and click 'Request a " "bridge...'" msgstr "" +"Então selecione 'Solicitar uma bridge a partir de torproject.org' e clique " +"'Solicitar uma bridge ...'" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[torspec/master] Bug 19859: Add stream isolation fields to STREAM event
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit f0364ccac62cff3334d9d7bad5340fd785096009 Author: JeremyRand <biolizard89(a)gmail.com> Date: Fri Sep 20 14:33:36 2019 +0000 Bug 19859: Add stream isolation fields to STREAM event --- control-spec.txt | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 97bee17..cb6f274 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2105,7 +2105,13 @@ "650" SP "STREAM" SP StreamID SP StreamStatus SP CircuitID SP Target [SP "REASON=" Reason [ SP "REMOTE_REASON=" Reason ]] [SP "SOURCE=" Source] [ SP "SOURCE_ADDR=" Address ":" Port ] - [SP "PURPOSE=" Purpose] + [SP "PURPOSE=" Purpose] [SP "SOCKS_USERNAME=" EscapedUsername] + [SP "SOCKS_PASSWORD=" EscapedPassword] + [SP "CLIENT_PROTOCOL=" ClientProtocol] SP "NYM_EPOCH=" NymEpoch + SP "SESSION_GROUP=" SessionGroup SP "ISO_DESTPORT=" IsoDestPort + SP "ISO_DESTADDR=" IsoDestAddr SP "ISO_SOCKSAUTH=" IsoSocksAuth + SP "ISO_CLIENTPROTO=" IsoClientProto + SP "ISO_CLIENTADDR=" IsoClientAddr CRLF StreamStatus = @@ -2123,6 +2129,26 @@ Port = an integer from 0 to 65535 inclusive TargetAddress = Address / "(Tor_internal)" + EscapedUsername = QuotedString + EscapedPassword = QuotedString + + ClientProtocol = + "SOCKS4" / + "SOCKS5" / + "TRANS" / + "NATD" / + "DNS" / + "UNKNOWN" + + NymEpoch = a nonnegative integer + SessionGroup = an integer + + IsoDestPort = a Boolean + IsoDestAddr = a Boolean + IsoSocksAuth = a Boolean + IsoClientProto = a Boolean + IsoClientAddr = a Boolean + The circuit ID designates which circuit this stream is attached to. If the stream is unattached, the circuit ID "0" is given. The target indicates the address which the stream is meant to resolve or connect to; @@ -2180,6 +2206,34 @@ "USER" -- This stream is handling user traffic, OR it's internal to Tor, but it doesn't match one of the purposes above. + The "SOCKS_USERNAME" and "SOCKS_PASSWORD" fields indicate the credentials + that were used by a SOCKS client to connect to Tor's SOCKS port and + initiate this stream. (Streams for SOCKS clients connected with different + usernames and/or passwords are isolated on separate circuits if the + IsolateSOCKSAuth flag is active; see Proposal 171.) + + The "CLIENT_PROTOCOL" field indicates the protocol that was used by a client + to initiate this stream. (Streams for clients connected with different + protocols are isolated on separate circuits if the IsolateClientProtocol + flag is active.) + + The "NYM_EPOCH" field indicates the nym epoch that was active when a client + initiated this stream. The epoch increments when the NEWNYM signal is + received. (Streams with different nym epochs are isolated on separate + circuits.) + + The "SESSION_GROUP" field indicates the session group of the listener port + that a client used to initiate this stream. By default, the session group is + different for each listener port, but this can be overridden for a listener + via the "SessionGroup" option in torrc. (Streams with different session + groups are isolated on separate circuits.) + + The "ISO_DESTPORT", "ISO_DESTADDR", "ISO_SOCKSAUTH", "ISO_CLIENTPROTO", and + "ISO_CLIENTADDR" fields indicate the values of the "IsolateDestPort", + "IsolateDestAddr", "IsolateSOCKSAuth", "IsolateClientProtocol", and + "IsolateClientAddr" flags for the listener port that a client used to + initiate this stream. + 4.1.3. OR Connection status changed The syntax is:

1 0

[torspec/master] Bug 19859: Consolidate flag fields into ISO_FIELDS
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit de0ea88236b01363e6259a2e46b53c1300438739 Author: JeremyRand <biolizard89(a)gmail.com> Date: Fri Oct 11 00:11:52 2019 +0000 Bug 19859: Consolidate flag fields into ISO_FIELDS --- control-spec.txt | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index cb6f274..9817a48 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2108,10 +2108,7 @@ [SP "PURPOSE=" Purpose] [SP "SOCKS_USERNAME=" EscapedUsername] [SP "SOCKS_PASSWORD=" EscapedPassword] [SP "CLIENT_PROTOCOL=" ClientProtocol] SP "NYM_EPOCH=" NymEpoch - SP "SESSION_GROUP=" SessionGroup SP "ISO_DESTPORT=" IsoDestPort - SP "ISO_DESTADDR=" IsoDestAddr SP "ISO_SOCKSAUTH=" IsoSocksAuth - SP "ISO_CLIENTPROTO=" IsoClientProto - SP "ISO_CLIENTADDR=" IsoClientAddr + SP "SESSION_GROUP=" SessionGroup SP "ISO_FIELDS=" IsoFields CRLF StreamStatus = @@ -2143,11 +2140,14 @@ NymEpoch = a nonnegative integer SessionGroup = an integer - IsoDestPort = a Boolean - IsoDestAddr = a Boolean - IsoSocksAuth = a Boolean - IsoClientProto = a Boolean - IsoClientAddr = a Boolean + IsoFields = a comma-separated list of IsoField values + + IsoField = + "CLIENTADDR" / + "CLIENTPORT" / + "DESTADDR" / + "DESTPORT" / + the name of a field that is valid for STREAM events The circuit ID designates which circuit this stream is attached to. If the stream is unattached, the circuit ID "0" is given. The target @@ -2228,11 +2228,12 @@ via the "SessionGroup" option in torrc. (Streams with different session groups are isolated on separate circuits.) - The "ISO_DESTPORT", "ISO_DESTADDR", "ISO_SOCKSAUTH", "ISO_CLIENTPROTO", and - "ISO_CLIENTADDR" fields indicate the values of the "IsolateDestPort", - "IsolateDestAddr", "IsolateSOCKSAuth", "IsolateClientProtocol", and - "IsolateClientAddr" flags for the listener port that a client used to - initiate this stream. + The "ISO_FIELDS" field indicates the set of STREAM event fields for which + stream isolation is enabled for the listener port that a client used to + initiate this stream. The special values "CLIENTADDR", "CLIENTPORT", + "DESTADDR", and "DESTPORT", if their correspondingly named fields are not + present, refer to the Address and Port components of the "SOURCE_ADDR" and + Target fields. 4.1.3. OR Connection status changed

1 0

[torspec/master] Bug 19859: Note that client protocols might be extended later
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit cd916518f3e3ea5f8a390d24727eadf68cb8271f Author: JeremyRand <biolizard89(a)gmail.com> Date: Wed Oct 9 22:56:51 2019 +0000 Bug 19859: Note that client protocols might be extended later --- control-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 03439eb..d7c7cc9 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2215,7 +2215,7 @@ The "CLIENT_PROTOCOL" field indicates the protocol that was used by a client to initiate this stream. (Streams for clients connected with different protocols are isolated on separate circuits if the IsolateClientProtocol - flag is active.) + flag is active.) Controllers MUST tolerate unrecognized client protocols. The "NYM_EPOCH" field indicates the nym epoch that was active when a client initiated this stream. The epoch increments when the NEWNYM signal is

1 0

[torspec/master] Bug 19859: Mark all stream isolation fields as optional
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit c5d276cfb9192e95862ece77c35c104946d87634 Author: JeremyRand <biolizard89(a)gmail.com> Date: Wed Oct 9 22:52:24 2019 +0000 Bug 19859: Mark all stream isolation fields as optional --- control-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 9817a48..03439eb 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2107,8 +2107,8 @@ [SP "SOURCE=" Source] [ SP "SOURCE_ADDR=" Address ":" Port ] [SP "PURPOSE=" Purpose] [SP "SOCKS_USERNAME=" EscapedUsername] [SP "SOCKS_PASSWORD=" EscapedPassword] - [SP "CLIENT_PROTOCOL=" ClientProtocol] SP "NYM_EPOCH=" NymEpoch - SP "SESSION_GROUP=" SessionGroup SP "ISO_FIELDS=" IsoFields + [SP "CLIENT_PROTOCOL=" ClientProtocol] [SP "NYM_EPOCH=" NymEpoch] + [SP "SESSION_GROUP=" SessionGroup] [SP "ISO_FIELDS=" IsoFields] CRLF StreamStatus =

1 0

[torspec/master] Bug 19859: Add HTTPCONNECT client protocol
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit 54a7ad226cba634ae321a9f3f542ce2ff03ef302 Author: JeremyRand <biolizard89(a)gmail.com> Date: Sun Oct 27 06:23:54 2019 +0000 Bug 19859: Add HTTPCONNECT client protocol --- control-spec.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index d7c7cc9..ab164ea 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2130,11 +2130,12 @@ EscapedPassword = QuotedString ClientProtocol = - "SOCKS4" / - "SOCKS5" / - "TRANS" / - "NATD" / - "DNS" / + "SOCKS4" / + "SOCKS5" / + "TRANS" / + "NATD" / + "DNS" / + "HTTPCONNECT" / "UNKNOWN" NymEpoch = a nonnegative integer

1 0

[torspec/master] Merge remote-tracking branch 'JeremyRand/stream-event-isolation'
by nickm＠torproject.org 25 Nov '19

25 Nov '19

commit cf66598f44f104d3322536764e43d0a7a49ff588 Merge: 7c22213 54a7ad2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 25 08:43:50 2019 -0500 Merge remote-tracking branch 'JeremyRand/stream-event-isolation' control-spec.txt | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-)

1 0