commit 495c007916ef9a678113c0b1404a7519d6881f0c Author: Georg Koppen gk@torproject.org Date: Fri Aug 7 21:07:44 2015 +0000

Revert "Revert "Revert "Bug 14429: Enable auto-resizing; disable maximization warning."""

This reverts commit edeaca158e86d1be1bea5bbb92cc6a3c9f481c23. --- src/defaults/preferences/preferences.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ce66d0e..83706ef 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -113,7 +113,7 @@ pref("extensions.torbutton.prompted_language",false); // TODO: This is just part of a stopgap until #14429 gets properly implemented. // See #7255 for details. We display the warning three times to make sure the // user did not click on it by accident. -pref("extensions.torbutton.maximize_warnings_remaining", 0); +pref("extensions.torbutton.maximize_warnings_remaining", 3); pref("extensions.torbutton.startup_resize_period", true);

// Security prefs: @@ -154,7 +154,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.resize_windows",true); +pref("extensions.torbutton.resize_windows",false); pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false);