September 2012 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug6815'
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit a73dec16c539fd957ab09f242cd44b0a0858cd38 Merge: 79b31dd 19136f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 16:28:59 2012 -0400 Merge branch 'bug6815' changes/bug6815 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/directory.c | 48 ++++++++++++++++++++++++++++++++---------------- src/or/directory.h | 20 +++++++++++++++++--- src/or/networkstatus.c | 2 +- src/or/rendclient.c | 3 ++- src/or/rendservice.c | 3 ++-… [View More]

1 0

[tor/master] Fix directory self-testing logic
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 5cbeb6080596c4442a19cffb56c1a68316b3014a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 10:15:58 2012 -0400 Fix directory self-testing logic When I removed version_supports_begindir, I accidentally removed the mechanism we had been using to make a directory cache self-test its directory port. This caused bug 6815, which caused 6814 (both in 0.2.4.2-alpha). To fix this bug, I'm replacing the "anonymized_connection" argument to … [View More] directory_initiate_command_* with an enumeration to say how indirectly to connect to a directory server. (I don't want to reinstate the "version_supports_begindir" argument as "begindir_ok" or anything -- these functions already take too many arguments.) For safety, I made sure that passing 0 and 1 for 'indirection' gives the same result as you would have gotten before -- just in case I missed any 0s or 1s. --- changes/bug6815 | 6 ++++++ src/or/circuitbuild.c | 2 +- src/or/directory.c | 48 ++++++++++++++++++++++++++++++++---------------- src/or/directory.h | 20 +++++++++++++++++--- src/or/networkstatus.c | 2 +- src/or/rendclient.c | 3 ++- src/or/rendservice.c | 3 ++- src/or/router.c | 2 +- src/or/routerlist.c | 2 +- 9 files changed, 63 insertions(+), 25 deletions(-) diff --git a/changes/bug6815 b/changes/bug6815 new file mode 100644 index 0000000..d6a1233 --- /dev/null +++ b/changes/bug6815 @@ -0,0 +1,6 @@ + o Major bugfixes: + - Allow routers to correctly detect their own DirPorts as running. + When we removed support for versions_supports_begindir, we also + accidentally removed the mechanism we used to self-test our + DirPort. Diagnosed with help from kargig. Fixes bugs 6814 and + 6815; bugfix on 0.2.4.2-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fe327ca..4384e29 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5479,7 +5479,7 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t *bridge) bridge->identity, DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_BRIDGE, - 0, "authority.z", NULL, 0, 0); + DIRIND_ONEHOP, "authority.z", NULL, 0, 0); tor_free(address); } diff --git a/src/or/directory.c b/src/or/directory.c index d22a8b8..effccc5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -91,7 +91,7 @@ static void directory_initiate_command_rend(const char *address, const char *digest, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, @@ -432,7 +432,8 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, ri->cache_info.identity_digest, dir_purpose, router_purpose, - 0, resource, NULL, 0, if_modified_since); + DIRIND_ONEHOP, + resource, NULL, 0, if_modified_since); } else log_notice(LD_DIR, "Ignoring directory request, since no bridge " "nodes are available yet."); @@ -493,13 +494,15 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, } } - if (rs) + if (rs) { + const dir_indirection_t indirection = + get_via_tor ? DIRIND_ANONYMOUS : DIRIND_ONEHOP; directory_initiate_command_routerstatus(rs, dir_purpose, router_purpose, - get_via_tor, + indirection, resource, NULL, 0, if_modified_since); - else { + } else { log_notice(LD_DIR, "While fetching directory info, " "no running dirservers known. Will try again later. " @@ -531,17 +534,25 @@ directory_get_from_all_authorities(uint8_t dir_purpose, continue; rs = &ds->fake_status; directory_initiate_command_routerstatus(rs, dir_purpose, router_purpose, - 0, resource, NULL, 0, 0); + DIRIND_ONEHOP, resource, NULL, + 0, 0); } SMARTLIST_FOREACH_END(ds); } +/** Return true iff <b>ind</b> requires a multihop circuit. */ +static int +dirind_is_anon(dir_indirection_t ind) +{ + return ind == DIRIND_ANON_DIRPORT || ind == DIRIND_ANONYMOUS; +} + /** Same as directory_initiate_command_routerstatus(), but accepts * rendezvous data to fetch a hidden service descriptor. */ void directory_initiate_command_routerstatus_rend(const routerstatus_t *status, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, @@ -554,6 +565,7 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status, struct in_addr in; const char *address; tor_addr_t addr; + const int anonymized_connection = dirind_is_anon(indirection); node = node_get_by_id(status->identity_digest); if (!node && anonymized_connection) { @@ -585,7 +597,7 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status, status->or_port, status->dir_port, status->identity_digest, dir_purpose, router_purpose, - anonymized_connection, resource, + indirection, resource, payload, payload_len, if_modified_since, rend_query); } @@ -608,7 +620,7 @@ void directory_initiate_command_routerstatus(const routerstatus_t *status, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, @@ -616,7 +628,7 @@ directory_initiate_command_routerstatus(const routerstatus_t *status, { directory_initiate_command_routerstatus_rend(status, dir_purpose, router_purpose, - anonymized_connection, resource, + indirection, resource, payload, payload_len, if_modified_since, NULL); } @@ -818,11 +830,13 @@ static int directory_command_should_use_begindir(const or_options_t *options, const tor_addr_t *addr, int or_port, uint8_t router_purpose, - int anonymized_connection) + dir_indirection_t indirection) { if (!or_port) return 0; /* We don't know an ORPort -- no chance. */ - if (!anonymized_connection) + if (indirection == DIRIND_DIRECT_CONN || indirection == DIRIND_ANON_DIRPORT) + return 0; + if (indirection == DIRIND_ONEHOP) if (!fascist_firewall_allows_address_or(addr, or_port) || directory_fetches_from_authorities(options)) return 0; /* We're firewalled or are acting like a relay -- also no. */ @@ -842,13 +856,13 @@ directory_initiate_command(const char *address, const tor_addr_t *_addr, uint16_t or_port, uint16_t dir_port, const char *digest, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, const char *resource, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, time_t if_modified_since) { directory_initiate_command_rend(address, _addr, or_port, dir_port, digest, dir_purpose, - router_purpose, anonymized_connection, + router_purpose, indirection, resource, payload, payload_len, if_modified_since, NULL); } @@ -874,7 +888,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, uint16_t or_port, uint16_t dir_port, const char *digest, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, time_t if_modified_since, @@ -884,7 +898,8 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, const or_options_t *options = get_options(); int socket_error = 0; int use_begindir = directory_command_should_use_begindir(options, _addr, - or_port, router_purpose, anonymized_connection); + or_port, router_purpose, indirection); + const int anonymized_connection = dirind_is_anon(indirection); tor_addr_t addr; tor_assert(address); @@ -930,6 +945,7 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, conn->_base.state = DIR_CONN_STATE_CONNECTING; /* decide whether we can learn our IP address from this conn */ + /* XXXX This is a bad name for this field now. */ conn->dirconn_direct = !anonymized_connection; /* copy rendezvous data, if any */ diff --git a/src/or/directory.h b/src/or/directory.h index 14444c0..7029abc 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -22,10 +22,24 @@ void directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, void directory_get_from_all_authorities(uint8_t dir_purpose, uint8_t router_purpose, const char *resource); + +/** Enumeration of ways to connect to a directory server */ +typedef enum { + /** Default: connect over a one-hop Tor circuit but fall back to direct + * connection */ + DIRIND_ONEHOP=0, + /** Connect over a multi-hop anonymizing Tor circuit */ + DIRIND_ANONYMOUS=1, + /** Conncet to the DirPort directly */ + DIRIND_DIRECT_CONN, + /** Connect over a multi-hop anonymizing Tor circuit to our dirport */ + DIRIND_ANON_DIRPORT, +} dir_indirection_t; + void directory_initiate_command_routerstatus(const routerstatus_t *status, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, @@ -33,7 +47,7 @@ void directory_initiate_command_routerstatus(const routerstatus_t *status, void directory_initiate_command_routerstatus_rend(const routerstatus_t *status, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, @@ -53,7 +67,7 @@ void directory_initiate_command(const char *address, const tor_addr_t *addr, uint16_t or_port, uint16_t dir_port, const char *digest, uint8_t dir_purpose, uint8_t router_purpose, - int anonymized_connection, + dir_indirection_t indirection, const char *resource, const char *payload, size_t payload_len, time_t if_modified_since); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 0df5c4e..ff31f82 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1168,7 +1168,7 @@ update_v2_networkstatus_cache_downloads(time_t now) directory_initiate_command_routerstatus( &ds->fake_status, DIR_PURPOSE_FETCH_V2_NETWORKSTATUS, ROUTER_PURPOSE_GENERAL, - 0, /* Not private */ + DIRIND_ONEHOP, resource, NULL, 0 /* No payload. */, 0 /* No I-M-S. */); diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 5b3b92e..0b6d82b 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -617,7 +617,8 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) directory_initiate_command_routerstatus_rend(hs_dir, DIR_PURPOSE_FETCH_RENDDESC_V2, ROUTER_PURPOSE_GENERAL, - !tor2web_mode, desc_id_base32, + tor2web_mode?DIRIND_ONEHOP:DIRIND_ANONYMOUS, + desc_id_base32, NULL, 0, 0, rend_query); log_info(LD_REND, "Sending fetch request for v2 descriptor for " diff --git a/src/or/rendservice.c b/src/or/rendservice.c index bd8b13a..394831f 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -2782,7 +2782,8 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc, directory_initiate_command_routerstatus(hs_dir, DIR_PURPOSE_UPLOAD_RENDDESC_V2, ROUTER_PURPOSE_GENERAL, - 1, NULL, desc->desc_str, + DIRIND_ANONYMOUS, NULL, + desc->desc_str, strlen(desc->desc_str), 0); base32_encode(desc_id_base32, sizeof(desc_id_base32), desc->desc_id, DIGEST_LEN); diff --git a/src/or/router.c b/src/or/router.c index 4e1eb2d..a26dccc 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -957,7 +957,7 @@ consider_testing_reachability(int test_or, int test_dir) me->cache_info.identity_digest, DIR_PURPOSE_FETCH_SERVERDESC, ROUTER_PURPOSE_GENERAL, - 1, "authority.z", NULL, 0, 0); + DIRIND_ANON_DIRPORT, "authority.z", NULL, 0, 0); } } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 41abc4c..214c086 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -4326,7 +4326,7 @@ initiate_descriptor_downloads(const routerstatus_t *source, /* We know which authority we want. */ directory_initiate_command_routerstatus(source, purpose, ROUTER_PURPOSE_GENERAL, - 0, /* not private */ + DIRIND_ONEHOP, resource, NULL, 0, 0); } else { directory_get_from_dirserver(purpose, ROUTER_PURPOSE_GENERAL, resource, [View Less]

1 0

[tor/master] Fix a wide line
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 19136f6f1108c90fa4ede97d36a1bc16765e451a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 16:28:46 2012 -0400 Fix a wide line --- src/or/directory.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/directory.h b/src/or/directory.h index 7029abc..fef671a 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -47,7 +47,7 @@ void directory_initiate_command_routerstatus(const routerstatus_t *status, void … [View More]

1 0

[tor-cloud/master] Update URLs for signatures and tarball
by runa＠torproject.org 12 Sep '12

12 Sep '12

commit d76da61f5ce412ebe59f1bb5051ad565315b5b78 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Wed Sep 12 20:43:07 2012 +0100 Update URLs for signatures and tarball --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 2ea398c..102cd36 100755 --- a/build.sh +++ b/build.sh @@ -83,7 +83,7 @@ echo "After attaching the volume, sleep for 20 seconds..." sleep 20 # Get the files we need -ssh -o UserKnownHostsFile=/… [View More]

1 0

[tor/master] Revert "6819: typo in torrc.sample.in"
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 45439bfced7f41c2e0beecb715880cb83d421618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 15:37:47 2012 -0400 Revert "6819: typo in torrc.sample.in" This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161. We don't actually want to be changing the torrc.sample on stable or near-stable stuff, since doing so makes pointless busywork for debian users. --- changes/bug6819 | 3 --- src/config/torrc.sample.in | 2 +- … [View More]

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 79b31dd4f8b45d9c68fa33dcd564deb60a26286e Merge: 35e19b9 45439bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 15:38:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3 just reverted.

1 0

[tor/maint-0.2.3] Revert "6819: typo in torrc.sample.in"
by nickm＠torproject.org 12 Sep '12

12 Sep '12

commit 45439bfced7f41c2e0beecb715880cb83d421618 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 15:37:47 2012 -0400 Revert "6819: typo in torrc.sample.in" This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161. We don't actually want to be changing the torrc.sample on stable or near-stable stuff, since doing so makes pointless busywork for debian users. --- changes/bug6819 | 3 --- src/config/torrc.sample.in | 2 +- … [View More]

1 0

[torbutton/master] Disable update tor proxy filter.
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit 0197222e341ed7f331cfaf9a1582c84f963348df Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 11 14:43:19 2012 -0700 Disable update tor proxy filter. It might not be causing any problems, but it's not functional any more either. --- src/chrome/content/torbutton.js | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index a7c91dc..2ced2fd 100644 --- a/src/chrome/… [View More]

1 0

[torbutton/master] Bug 6803: Read proxy environment variables early on
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit 9790fdae64a4304032dce581b030974bb11c25f1 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 11 19:12:12 2012 -0700 Bug 6803: Read proxy environment variables early on It turns out Firefox 15 appears to be caching proxy settings for a particular URL. We needed to be able to retrieve our new proxy settings before anything else runs. Hence, move the env checks to XPCOM. --- src/chrome/content/torbutton.js | 62 ++++++++++++++-----------------------… [View More]- src/components/crash-observer.js | 40 ++++++++++++++++++++++++ src/install.rdf | 2 +- 3 files changed, 64 insertions(+), 40 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 2ced2fd..1f82836 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -505,6 +505,14 @@ function torbutton_init_toolbutton() // called once per browser window.. This might belong in a component. function torbutton_init() { torbutton_log(3, 'called init()'); + + if (m_tb_wasinited) { + return; + } + m_tb_wasinited = true; + + m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); // Determine if we are firefox 3 or not. var appInfo = Components.classes["@mozilla.org/xre/app-info;1"] @@ -542,16 +550,20 @@ function torbutton_init() { m_tb_ff36 = false; } + try { + var test = m_tb_prefs.getCharPref("torbrowser.version"); + m_tb_tbb = true; + torbutton_log(3, "This is a Tor Browser"); + } catch(e) { + torbutton_log(3, "This is not a Tor Browser: "+e); + } + // Bug 1506 P4: These vars are very important for New Identity var environ = Components.classes["@mozilla.org/process/environment;1"] .getService(Components.interfaces.nsIEnvironment); if (environ.exists("TOR_CONTROL_PASSWD")) { m_tb_control_pass = environ.get("TOR_CONTROL_PASSWD"); - - // FIXME: We might want a check to use to set this in the future, - // but this works fine for now. - m_tb_tbb = true; } else if (environ.exists("TOR_CONTROL_COOKIE_AUTH_FILE")) { var cookie_path = environ.get("TOR_CONTROL_COOKIE_AUTH_FILE"); try { @@ -582,19 +594,10 @@ function torbutton_init() { // listen for our toolbar button being added so we can initialize it torbutton_init_toolbutton(); - if (!m_tb_wasinited) { - // Runs every time a new window is opened - m_tb_prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefBranch); + torbutton_init_jshooks(); - torbutton_init_jshooks(); - - torbutton_log(1, 'registering pref observer'); - torbutton_window_pref_observer.register(); - m_tb_wasinited = true; - } else { - torbutton_log(1, 'skipping pref observer init'); - } + torbutton_log(1, 'registering pref observer'); + torbutton_window_pref_observer.register(); //setting up context menu var contextMenu = document.getElementById("contentAreaContextMenu"); @@ -956,7 +959,8 @@ function torbutton_do_async_versioncheck() { if (!m_tb_tbb || !m_tb_prefs.getBoolPref("extensions.torbutton.versioncheck_enabled")) { return; } - torbutton_log(3, "Checking version"); + torbutton_log(3, "Checking version with socks port: " + +m_tb_prefs.getIntPref("extensions.torbutton.socks_port")); try { var req = Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"] .createInstance(Components.interfaces.nsIXMLHttpRequest); @@ -3116,6 +3120,8 @@ function torbutton_do_versioncheck() { function torbutton_reload_homepage() { var homepage = m_tb_prefs.getComplexValue("browser.startup.homepage", Components.interfaces.nsIPrefLocalizedString).data; + + torbutton_log(3, "Reloading homepage: "+homepage); gBrowser.loadURI(homepage, null, null); } @@ -4196,28 +4202,6 @@ function torbutton_do_startup() torbutton_new_google_cookie(); } - // Bug 1506: Still want to get these env vars - var environ = Components.classes["@mozilla.org/process/environment;1"] - .getService(Components.interfaces.nsIEnvironment); - - if (environ.exists("TOR_SOCKS_PORT")) { - m_tb_prefs.setIntPref('extensions.torbutton.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - if (m_tb_tbb) { - m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); - } - } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - m_tb_prefs.setIntPref('extensions.torbutton.socks_port', 9050); - } - - if (environ.exists("TOR_SOCKS_HOST")) { - m_tb_prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST")); - if (m_tb_tbb) { - m_tb_prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); - } - } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { - m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); - } - if (!m_tb_tbb && m_tb_prefs.getBoolPref("extensions.torbutton.prompt_torbrowser")) { var o_stringbundle = torbutton_get_stringbundle(); var warning = o_stringbundle.GetStringFromName("torbutton.popup.short_torbrowser"); diff --git a/src/components/crash-observer.js b/src/components/crash-observer.js index 776aed5..ab97fba 100644 --- a/src/components/crash-observer.js +++ b/src/components/crash-observer.js @@ -54,6 +54,14 @@ function CrashObserver() { this.is_ff4 = false; } + try { + var test = this._prefs.getCharPref("torbrowser.version"); + this.is_tbb = true; + this.logger.log(3, "This is a Tor Browser's XPCOM"); + } catch(e) { + this.logger.log(3, "This is not a Tor Browser's XPCOM"); + } + if (this.is_ff4) { // Bug 1506 P2/P3: You probably want to register this observer to clean up // prefs if you're going to support using normal firefox. @@ -102,6 +110,36 @@ CrashObserver.prototype = { } }, + // Bug 6803: We need to get the env vars early due to + // some weird proxy caching code that showed up in FF15. + // Otherwise, homepage domain loads fail forever. + getProxySettings: function() { + // Bug 1506: Still want to get these env vars + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_SOCKS_PORT")) { + this.logger.log(3, "Resetting socks port to "+environ.get("TOR_SOCKS_PORT")); + this._prefs.setIntPref('extensions.torbutton.socks_port', + parseInt(environ.get("TOR_SOCKS_PORT"))); + if (this.is_tbb) { + this._prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT"))); + } + } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { + this._prefs.setIntPref('extensions.torbutton.socks_port', 9050); + } + + if (environ.exists("TOR_SOCKS_HOST")) { + this._prefs.setCharPref('extensions.torbutton.socks_host', environ.get("TOR_SOCKS_HOST")); + if (this.is_tbb) { + this._prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST")); + } + } else if (this._prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') { + this._prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1'); + } + + }, + observe: function(subject, topic, data) { if(topic == "profile-after-change") { // Bug 1506 P1: We listen to these prefs as signals for startup, @@ -116,6 +154,8 @@ CrashObserver.prototype = { this._prefs.setBoolPref("extensions.torbutton.crashed", true); } this._prefs.setBoolPref("extensions.torbutton.normal_exit", false); + + this.getProxySettings(); } else if (topic == "em-action-requested") { this.logger.log(3, "Uninstall action requested.."); // http://xulsolutions.blogspot.com/2006/07/creating-uninstall-script-for.html diff --git a/src/install.rdf b/src/install.rdf index 7eac84a..24d314d 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -10,7 +10,7 @@ em:name="Torbutton" em:creator="Mike Perry" em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}" - em:version="1.4.6.1" + em:version="1.4.6.2" em:homepageURL="https://www.torproject.org/torbutton/" em:optionsURL="chrome://torbutton/content/preferences.xul" em:iconURL="chrome://torbutton/skin/tor.png" [View Less]

1 0

[torbutton/master] Update changelog for 1.4.6.2.
by mikeperry＠torproject.org 12 Sep '12

12 Sep '12

commit 39af4fa99ad74badc65bf3bb973adb6dc9d955b0 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Sep 12 12:16:13 2012 -0700 Update changelog for 1.4.6.2. --- src/CHANGELOG | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index df682d0..05cf8cb 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.4.6.2 + 12 Sep 2012 + * bug 6803: Set proxy settings earlier to fix broken homepage load on FF15 + * bug … [View More]

1 0