[Pkg-mozext-commits] [SCM] torbutton Debian packaging branch, master, updated. debian/1.4.5.1-1
Jérémy Bobbio
lunar at debian.org
Mon Dec 26 16:30:55 UTC 2011
The following commit has been merged in the master branch:
commit 670630707e23151537a7bf4b0d74f1407c81ac1d
Merge: 6e30b9c090e03c445eaa849f301d96fec37ba4d6 7377e0f1b0595bdccdfa11ac9c86291e8113d224
Author: Jérémy Bobbio <lunar at debian.org>
Date: Mon Dec 26 16:52:19 2011 +0100
Merge commit 'upstream/1.4.5.1'
diff --combined src/chrome/content/torbutton.js
index d0b2461,57261c9..ca370d2
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@@ -352,18 -352,10 +352,18 @@@ function torbutton_set_panel_view()
if (!o_statuspanel || !o_prefbranch) return;
// Firefox 4 has no toolbar panel
- var display_panel = o_prefbranch.getBoolPref('display_panel')
- && !m_tb_ff4;
+ var display_panel = o_prefbranch.getBoolPref('display_panel');
torbutton_log(2, 'setting panel visibility');
o_statuspanel.setAttribute('collapsed', !display_panel);
+
+ // Prevent the FF4 nav bar from making our menu invisible...
+ var o_toolbutton = torbutton_get_toolbutton();
+ if (o_toolbutton) {
+ var context = document.getElementById('torbutton-context-menu');
+ context.style.visibility = "visible";
+ context.hidden = false;
+ torbutton_log(3, "Set new context menu.");
+ }
}
function torbutton_set_panel_style() {
@@@ -477,6 -469,16 +477,6 @@@ function torbutton_init_toolbutton(
{
try {
torbutton_log(3, "Initializing the Torbutton button.");
- // Prevent the FF4 status bar from making our menu invisible...
- /* Not needed
- var o_toolbutton = torbutton_get_toolbutton();
- if (o_toolbutton) {
- var context = document.getElementById('torbutton-context-menu');
- context.style.visibility = "visible";
- context.hidden = false;
- torbutton_log(3, "Set new context menu.");
- }
- */
torbutton_update_toolbutton(torbutton_check_status());
} catch(e) {
torbutton_log(4, "Error Initializing Torbutton button: "+e);
@@@ -721,7 -723,7 +721,7 @@@ function torbutton_init_prefs()
torprefs.setBoolPref('use_privoxy', true);
if (torprefs.getBoolPref('use_privoxy')) {
- proxy_host = '127.0.0.1';
+ proxy_host = 'localhost';
proxy_port = 8118;
} else {
proxy_host = '';
@@@ -1356,6 -1358,15 +1356,15 @@@ function torbutton_send_ctrl_cmd(comman
}
}
+ function torbutton_new_identity() {
+ try {
+ torbutton_do_new_identity();
+ } catch(e) {
+ torbutton_log(5, "Unexpected error on new identity: "+e);
+ window.alert("Torbutton: Unexpected error on new identity: "+e);
+ }
+ }
+
/* The "New Identity" implementation does the following:
* 1. Tag all tabs as non-tor
* 2. Disables Javascript and plugins on all tabs
@@@ -1373,7 -1384,7 +1382,7 @@@
*
* XXX: intermediate SSL certificates are not cleared.
*/
- function torbutton_new_identity() {
+ function torbutton_do_new_identity() {
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
.getService(Components.interfaces.nsIWindowMediator);
var enumerator = wm.getEnumerator("navigator:browser");
@@@ -1476,6 -1487,7 +1485,7 @@@
cache.evictEntries(0);
} catch(e) {
torbutton_log(5, "Exception on cache clearing: "+e);
+ window.alert("Torbutton: Unexpected error during cache clearing: "+e);
}
if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) {
@@@ -1489,6 -1501,11 +1499,11 @@@
torbutton_clear_cookies();
}
+ // Clear keep-alive
+ var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);
+ obsSvc.notifyObservers(this, "net:prune-all-connections", null);
+
+ // XXX: This may not clear zoom site-specific
var cps = Cc["@mozilla.org/content-pref/service;1"].
createInstance(Ci.nsIContentPrefService);
cps.removeGroupedPrefs();
@@@ -1506,7 -1523,10 +1521,10 @@@
window.alert(warning);
} else {
if(torbutton_send_ctrl_cmd("SIGNAL NEWNYM\r\n") == 0) {
+ var o_stringbundle = torbutton_get_stringbundle();
+ var warning = o_stringbundle.GetStringFromName("torbutton.popup.no_newnym");
torbutton_log(5, "Torbutton was unable to request a new circuit from Tor");
+ window.alert(warning);
}
}
@@@ -1514,7 -1534,6 +1532,6 @@@
torbutton_set_window_size(gBrowser.contentWindow);
torbutton_log(3, "New identity successful");
-
}
// toggles plugins: true for disabled, false for enabled
@@@ -1947,6 -1966,18 +1964,18 @@@ function torbutton_update_status(mode,
!m_tb_prefs.getBoolPref("security.enable_ssl2"));
}
+ // Disable ssl session tickets for tor usage
+ // https://trac.torproject.org/projects/tor/ticket/4099
+ m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !mode);
+
+ // Lower keep-alive timeout to reduce cross-domain linkability
+ // https://trac.torproject.org/projects/tor/ticket/4603
+ if (mode) {
+ m_tb_prefs.setIntPref("network.http.keep-alive.timeout", 20);
+ } else {
+ m_tb_prefs.clearUserPref("network.http.keep-alive.timeout");
+ }
+
// This clears the OCSP cache.
//
// nsNSSComponent::Observe() watches security.OCSP.enabled, which calls
@@@ -2906,9 -2937,10 +2935,10 @@@ function torbutton_set_launch_state(sta
torbutton_enable_tor(true);
torbutton_log(3, "Tor state updated.");
+ torbutton_do_versioncheck();
+
// Load our homepage again. We just killed it via the toggle.
if (!session_restore) {
- torbutton_do_versioncheck();
torbutton_reload_homepage();
}
} else {
@@@ -2919,10 -2951,11 +2949,11 @@@
if(state) torbutton_enable_tor(true);
else torbutton_disable_tor();
+
+ torbutton_do_versioncheck();
// Load our homepage again. We just killed it via the toggle.
if (!session_restore) {
- torbutton_do_versioncheck();
torbutton_reload_homepage();
}
}
@@@ -3889,7 -3922,7 +3920,7 @@@ function torbutton_do_startup(
if (m_tb_tbb) {
m_tb_prefs.setIntPref('network.proxy.socks_port', parseInt(environ.get("TOR_SOCKS_PORT")));
}
- } else {
+ } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') {
m_tb_prefs.setIntPref('extensions.torbutton.socks_port', 9050);
}
@@@ -3898,7 -3931,7 +3929,7 @@@
if (m_tb_tbb) {
m_tb_prefs.setCharPref('network.proxy.socks', environ.get("TOR_SOCKS_HOST"));
}
- } else {
+ } else if (m_tb_prefs.getCharPref('extensions.torbutton.settings_method') == 'recommended') {
m_tb_prefs.setCharPref('extensions.torbutton.socks_host', '127.0.0.1');
}
--
torbutton Debian packaging
More information about the Pkg-mozext-commits
mailing list