July 2016 - tor-commits - lists.torproject.org

[tor-messenger-build/master] Remove obsolete patching of torrc-defaults
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit b23115185109cf06cfe6a107c928de4e1d8a9533 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon Jul 11 12:19:36 2016 -0400 Remove obsolete patching of torrc-defaults --- projects/tor-messenger/build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/tor-messenger/build b/projects/tor-messenger/build index f50c490..d69c983 100755 --- a/projects/tor-messenger/build +++ b/projects/tor-messenger/build @@ -73,14 +73,10 @@ sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' tor-brow [% IF c("var/windows") -%] # use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ [^ ]\+ -- /\1 /' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults -sed -i 's|TorBrowser\\Tor\\PluggableTransports|TorBrowser\\Tor\\PluggableTransports|g' \ - tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults rm -f tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser.exe [% ELSE -%] # use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults -sed -i 's|TorBrowser/Tor/PluggableTransports|TorBrowser/Tor/PluggableTransports|g' \ - tor-browser_en-US/Browser/TorBrowser/Data/Tor/torrc-defaults rm -f tor-browser_en-US/Browser/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser [% END -%]

1 0

[tor-messenger-build/master] Rebase jar.mn patches
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 229c0e968c9b91b8f7125df6df4074862a39a879 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed Jul 13 15:42:37 2016 -0400 Rebase jar.mn patches --- projects/instantbird/aboutDialog-jar.patch | 19 +++++++++++-------- projects/instantbird/branding/jar.patch | 14 +++++++------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/projects/instantbird/aboutDialog-jar.patch b/projects/instantbird/aboutDialog-jar.patch index 91f13bf..2a1ed6d 100644 --- a/projects/instantbird/aboutDialog-jar.patch +++ b/projects/instantbird/aboutDialog-jar.patch @@ -1,12 +1,15 @@ diff --git a/im/content/jar.mn b/im/content/jar.mn --- a/im/content/jar.mn +++ b/im/content/jar.mn -@@ -10,6 +10,8 @@ +@@ -9,8 +9,9 @@ + % overlay chrome://mozapps/content/update/updates.xul chrome://instantbird/content/softwareUpdateOverlay.xul #endif - content/instantbird/aboutDialog.css - * content/instantbird/aboutDialog.xul -+ content/instantbird/aboutDialog.js -+ content/instantbird/aboutDialog-appUpdater.js - content/instantbird/aboutPanel.xml - content/instantbird/account.js - content/instantbird/accounts.css + content/instantbird/aboutDialog.css +-* content/instantbird/aboutDialog.xul +- content/instantbird/aboutPanel.xml ++ content/instantbird/aboutDialog.xul ++ content/instantbird/aboutDialog.js ++ content/instantbird/aboutDialog-appUpdater.js + content/instantbird/account.js + content/instantbird/accounts.css + content/instantbird/accounts.js diff --git a/projects/instantbird/branding/jar.patch b/projects/instantbird/branding/jar.patch index 7254d77..a9648c7 100644 --- a/projects/instantbird/branding/jar.patch +++ b/projects/instantbird/branding/jar.patch @@ -2,10 +2,10 @@ diff --git a/im/branding/messenger/jar.mn b/im/branding/messenger/jar.mn --- a/im/branding/messenger/jar.mn +++ b/im/branding/messenger/jar.mn @@ -8,3 +8,7 @@ - content/branding/about-footer.png (content/about-footer.png) - content/branding/about.png (content/about.png) - content/branding/icon64.png (content/icon64.png) -+ content/branding/aboutDialog.css (content/aboutDialog.css) -+ content/branding/about-logo.png (content/about-logo.png) -+ content/branding/about-logo(a)2x.png (content/about-logo(a)2x.png) -+ content/branding/about-wordmark.png (content/about-wordmark.png) + content/branding/about-footer.png (content/about-footer.png) + content/branding/about.png (content/about.png) + content/branding/icon64.png (content/icon64.png) ++ content/branding/aboutDialog.css (content/aboutDialog.css) ++ content/branding/about-logo.png (content/about-logo.png) ++ content/branding/about-logo(a)2x.png (content/about-logo(a)2x.png) ++ content/branding/about-wordmark.png (content/about-wordmark.png)

1 0

[tor-messenger-build/master] Update aboutDialog.js (add Instantbird text)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 02d9428a60593788f7a8395b346f73a7a21bf625 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 19 14:14:35 2016 -0400 Update aboutDialog.js (add Instantbird text) --- projects/instantbird/aboutDialog.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/instantbird/aboutDialog.js b/projects/instantbird/aboutDialog.js index 9cfecd1..b3ae0de 100644 --- a/projects/instantbird/aboutDialog.js +++ b/projects/instantbird/aboutDialog.js @@ -56,8 +56,7 @@ function init(aEvent) let versionElem = document.getElementById("version"); if (versionElem) { versionElem.textContent = TOR_BROWSER_VERSION + - " (based on Instantbird " + - versionElem.textContent + ")"; + " (based on Instantbird Nightly)"; } #endif

1 0

[tor-messenger-build/master] Update mozconfigs (add version and channel)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 920eb67bbd36af8cc97ad5d1543f6fc496be4b14 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 19 14:13:54 2016 -0400 Update mozconfigs (add version and channel) --- projects/instantbird/mozconfig-linux-i686 | 2 ++ projects/instantbird/mozconfig-linux-x86_64 | 2 ++ projects/instantbird/mozconfig-osx-x86_64 | 2 ++ projects/instantbird/mozconfig-windows-i686 | 2 ++ 4 files changed, 8 insertions(+) diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index 7d382c8..890a86b 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -28,6 +28,8 @@ ac_add_options --disable-debug ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-tor-browser-update +ac_add_options --with-tor-browser-version= +ac_add_options --enable-update-channel=release ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 3e0ae6d..7b22791 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -23,6 +23,8 @@ ac_add_options --disable-debug ac_add_options --enable-default-toolkit=cairo-gtk2 ac_add_options --enable-tor-browser-update +ac_add_options --with-tor-browser-version= +ac_add_options --enable-update-channel=release ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 7e84a77..dafeeef 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -28,6 +28,8 @@ ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-tor-browser-update +ac_add_options --with-tor-browser-version= +ac_add_options --enable-update-channel=release ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 129aad0..0c3ff3c 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -28,6 +28,8 @@ ac_add_options --disable-signmar ac_add_options --disable-debug ac_add_options --enable-tor-browser-update +ac_add_options --with-tor-browser-version= +ac_add_options --enable-update-channel=release ac_add_options --enable-update-packaging ac_add_options --enable-signmar ac_add_options --enable-verify-mar

1 0

[tor-messenger-build/master] Outside app directory should be Tor Messenger (#13252)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 945735a389a2993b70d84254c2898fc71df21529 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 21 13:46:31 2016 -0400 Outside app directory should be Tor Messenger (#13252) --- projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch index a68f446..4ddb4c0 100644 --- a/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch +++ b/projects/instantbird/Mac-outside-app-data-bug-13252.mozpatch @@ -697,7 +697,7 @@ index 403e820..e3c1449 100644 - nsCOMPtr<nsIFile> localDir; - rv = appRootDir->GetParent(getter_AddRefs(localDir)); - NS_ENSURE_SUCCESS(rv, rv); -- rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser-Data" +- rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger-Data" - XPCOM_FILE_PATH_SEPARATOR "UpdateInfo")); -#else - // For Tor Browser, we cannot store update history, etc. under the user's home directory. @@ -862,7 +862,7 @@ index 0000000..2b0b100 + nsCOMPtr<nsIFile> tbDataDir; + +#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR -+ nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data")); ++ nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorMessenger-Data")); + nsCOMPtr<nsIFile> appRootDir; + nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); + NS_ENSURE_SUCCESS(rv, rv);

1 0

[tor-messenger-build/master] Patch for #13252 is only for OS X
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit a55cf751cb3169712d72b543b18ced84124976a0 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 21 13:47:06 2016 -0400 Patch for #13252 is only for OS X --- projects/instantbird/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/instantbird/config b/projects/instantbird/config index f6db253..fe98a83 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -126,6 +126,7 @@ input_files: - filename: Improve-profile-access-bug-14631-first.mozpatch - filename: Improve-profile-access-bug-14631-second.mozpatch - filename: Mac-outside-app-data-bug-13252.mozpatch + enable: '[% c("var/osx") %]' - filename: Sign-MAR-files-bug-13379.mozpatch - filename: Update-load-local-changes-bug-14392-first.mozpatch - filename: Update-load-local-changes-bug-16940-second.mozpatch

1 0

[tor-messenger-build/master] Update build.osx to reflect changes in Tor Browser Bundle
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 2600de07f355ea5e544c5ec338f13cd6c1649f23 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 21 13:47:27 2016 -0400 Update build.osx to reflect changes in Tor Browser Bundle --- projects/tor-messenger/build.osx | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx index 99dc5a2..c7f46c7 100755 --- a/projects/tor-messenger/build.osx +++ b/projects/tor-messenger/build.osx @@ -2,7 +2,6 @@ set -e rootdir=$(pwd) tar xf [% c('input_files_by_name/instantbird') %] -mv TorMessenger.app Tor\ Messenger.app tar xf [% c('input_files_by_name/libdmg') %] export PATH="$(pwd)/libdmg-hfsplus:$PATH" @@ -18,36 +17,38 @@ cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \ tor-launcher(a)torproject.org/defaults/preferences/prefs.js 7z x $rootdir/[% c('input_files_by_name/tor-browser') %] bsdtar xf '0.unknown partition' -sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults -sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults +sed -i 's/^SocksPort .*/SocksPort [% c("var/tor_socks_port") %]/' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults +sed -i 's/^ControlPort .*/ControlPort [% c("var/tor_control_port") %]/' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults # use meek in standalone mode: https://lists.torproject.org/pipermail/tor-dev/2015-November/009887.html -sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' TorBrowser.app/TorBrowser/Data/Tor/torrc-defaults -mkdir -p tor-launcher(a)torproject.org/TorBrowser/Data +sed -i 's/$ClientTransportPlugin meek exec$ [^ ]\+ -- /\1 /' TorBrowser.app/Contents/Resources/TorBrowser/Tor/torrc-defaults + # trac 17476 -rm -Rf TorBrowser.app/TorBrowser/Tor/PluggableTransports/TorBrowser.app.meek-http-helper/ -rm -f TorBrowser.app/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -mv TorBrowser.app/TorBrowser/Tor tor-launcher(a)torproject.org/TorBrowser/Tor -mv TorBrowser.app/TorBrowser/Data/Tor tor-launcher(a)torproject.org/TorBrowser/Data/Tor -mv tor-launcher(a)torproject.org $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ +rm -Rf TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/TorBrowser.app.meek-http-helper/ +rm -f TorBrowser.app/Contents/Resources/TorBrowser/Tor/PluggableTransports/meek-client-torbrowser + +mkdir -p $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ +mv tor-launcher(a)torproject.org $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ cd .. mkdir ctypes-otr cd ctypes-otr tar xf $rootdir/[% c('input_files_by_name/ctypes-otr') %] -mv ctypes-otr* $rootdir/Tor\ Messenger.app/Contents/Resources/extensions/ctypes-otr@tormessenger +mv ctypes-otr* $rootdir/TorMessenger.app/Contents/Resources/distribution/extensions/ctypes-otr@tormessenger cd .. -mkdir Tor\ Messenger.app/TorMessenger -mv Bundle-Data/mac/TorBrowser/* Tor\ Messenger.app/TorMessenger/ +mkdir TorMessenger.app/TorBrowser/ +mv torbrowser/TorBrowser.app/Contents/Resources/TorBrowser/ $rootdir/TorMessenger.app/Contents/Resources/ + +mv torbrowser/TorBrowser.app/Contents/MacOS/Tor/ $rootdir/TorMessenger.app/Contents/MacOS/ mkdir dmg -mv Tor\ Messenger.app dmg +mv TorMessenger.app dmg cd dmg find . -executable -exec chmod 750 {} \; find . ! -executable -exec chmod 640 {} \; find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ../filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ../filelist.txt -mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../Tor\ Messenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 +mkisofs -D -V "Tor Messenger" -no-pad -R -apple -o ../TorMessenger-uncompressed.dmg -path-list ../filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd .. -dmg dmg Tor\ Messenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %] +dmg dmg TorMessenger-uncompressed.dmg [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-messenger-build/master] Add patch for disabling Tor Launcher locale prompt
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 4dc992312bdf098d5a8adbec9d05165269eaf670 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 21 16:01:12 2016 -0400 Add patch for disabling Tor Launcher locale prompt --- projects/tor-launcher/build | 1 + projects/tor-launcher/config | 1 + projects/tor-launcher/locale-disable.patch | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 8735d33..5b11d89 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -13,5 +13,6 @@ cp ../messenger.png src/chrome/skin/tbb-logo.png cp ../default48.png src/chrome/skin/default48.png [% END -%] patch -p1 < ../logo.patch +patch -p1 < ../locale-disable.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 5b108b7..fac0888 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -10,6 +10,7 @@ input_files: - filename: messenger.png - filename: default48.png - filename: logo.patch + - filename: locale-disable.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/locale-disable.patch b/projects/tor-launcher/locale-disable.patch new file mode 100644 index 0000000..c076262 --- /dev/null +++ b/projects/tor-launcher/locale-disable.patch @@ -0,0 +1,12 @@ +diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js +index 2c0a95e..0a0c299 100644 +--- a/src/defaults/preferences/prefs.js ++++ b/src/defaults/preferences/prefs.js +@@ -1,6 +1,6 @@ + // When presenting the setup wizard, first prompt for locale. + pref("intl.locale.matchOS", true); +-pref("extensions.torlauncher.prompt_for_locale", true); ++pref("extensions.torlauncher.prompt_for_locale", false); + + pref("extensions.torlauncher.loglevel", 4); // 1=verbose, 2=debug, 3=info, 4=note, 5=warn + pref("extensions.torlauncher.logmethod", 1); // 0=stdout, 1=errorconsole, 2=debuglog

1 0

[tor-messenger-build/master] Outside app directory should be Tor Messenger (#4234)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 091f8f9238a72c8943847ba61e1fb2ed15ed15b9 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Jul 21 13:46:15 2016 -0400 Outside app directory should be Tor Messenger (#4234) --- projects/instantbird/Firefox-update-process-bug-4234.mozpatch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/instantbird/Firefox-update-process-bug-4234.mozpatch b/projects/instantbird/Firefox-update-process-bug-4234.mozpatch index 8df0b37..86e527d 100644 --- a/projects/instantbird/Firefox-update-process-bug-4234.mozpatch +++ b/projects/instantbird/Firefox-update-process-bug-4234.mozpatch @@ -1575,7 +1575,7 @@ index 831a373..403e820 100644 + nsCOMPtr<nsIFile> localDir; + rv = appRootDir->GetParent(getter_AddRefs(localDir)); + NS_ENSURE_SUCCESS(rv, rv); -+ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorBrowser-Data" ++ rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger-Data" + XPCOM_FILE_PATH_SEPARATOR "UpdateInfo")); +#else + // For Tor Browser, we cannot store update history, etc. under the user's home directory.

1 0

[tor-messenger-build/master] Disable staged updates on Windows (#18292)
by arlo＠torproject.org 28 Jul '16

28 Jul '16

commit 85a64d7ea85e1f3ac9911c9f0df20103156af7f5 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Jul 19 14:14:56 2016 -0400 Disable staged updates on Windows (#18292) --- projects/instantbird/preferences.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 270dbe1..f94c7ad 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -35,12 +35,17 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. pref("font.default.x-western", "sans-serif"); pref("font.default.x-unicode", "sans-serif"); -@@ -142,26 +142,23 @@ +@@ -142,26 +142,28 @@ // Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example -pref("app.update.url", "https://update.instantbird.org/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARG…"); +pref("app.update.url", "https://www.torproject.org/dist/tormessenger/update_2/%CHANNEL%/%BUILD_TARG…"); ++ ++#ifdef XP_WIN ++// For now, disable staged updates on Windows (see #18292). ++pref("app.update.staging.enabled", false); ++#endif // URL user can browse to manually if for some reason all update installation // attempts fail. @@ -67,7 +72,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // Interval: Time before prompting the user to restart to install the latest // download (in seconds) default=30 minutes -@@ -202,7 +199,7 @@ +@@ -202,7 +204,7 @@ pref("browser.search.order.2", "chrome://instantbird/locale/region.properties"); // send ping to the server to update @@ -76,7 +81,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // disable logging for the search service update system by default pref("browser.search.update.log", false); -@@ -245,9 +242,9 @@ +@@ -245,9 +247,9 @@ pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/"); // suppress external-load warning for standard browser schemes @@ -89,7 +94,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); -@@ -262,10 +259,10 @@ +@@ -262,10 +264,10 @@ pref("network.protocol-handler.expose.javascript", true); // 0-Accept, 1-dontAcceptForeign, 2-dontUse @@ -102,7 +107,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. // We have an Error Console menu item by default so let's display chrome errors pref("javascript.options.showInConsole", true); -@@ -300,14 +297,70 @@ +@@ -300,14 +302,70 @@ // 3 at the end of the tabstrip pref("browser.tabs.closeButtons", 1);

1 0