January 2018 - tor-commits - lists.torproject.org

[torbutton/master] Bug 24159: version check does not deal with platform specific checks
by gk＠torproject.org 25 Jan '18

25 Jan '18

commit f8604998e58fdece9c191661121ada6a3b911499 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jan 23 16:04:11 2018 -0500 Bug 24159: version check does not deal with platform specific checks For known platforms, append "-Windows", "-Linux", "-MacOS", or "-Android" to torbrowser.version before checking against the recommended versions JSON file. This allows for platform differences in the supported version. --- src/chrome/content/torbutton.js | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 9abc1c5..7e78ff5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -752,12 +752,27 @@ function torbutton_do_async_versioncheck() { try { var version_list = JSON.parse(req.responseText); var my_version = m_tb_prefs.getCharPref("torbrowser.version"); - for (var v in version_list) { - if (version_list[v] == my_version) { - torbutton_log(3, "Version check passed."); - m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); - return; - } + var platformSuffix; + var platform = Services.appinfo.OS; + switch (platform) { + case "WINNT": + platformSuffix = "Windows"; + break; + case "Darwin": + platformSuffix = "MacOS"; + break; + case "Linux": + case "Android": + platformSuffix = platform; + break; + } + if (platformSuffix) + my_version += "-" + platformSuffix; + + if (version_list.indexOf(my_version) >= 0) { + torbutton_log(3, "Version check passed."); + m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, false); + return; } torbutton_log(5, "Your Tor Browser is out of date."); m_tb_prefs.setBoolPref(k_tb_browser_update_needed_pref, true);

1 0

[torspec/master] Note that "protocols" will become mandatory.
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit e6c3257b065f7fe816843bf37de3c3b958d30ee7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 25 15:22:19 2018 -0500 Note that "protocols" will become mandatory. Closes ticket 24023. --- dir-spec.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 2f4a766..e30a2fd 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -773,7 +773,7 @@ "proto" SP Entries NL - [At most one.] + [At most one.] [Will become mandatory.] Entries = Entries = Entry @@ -797,6 +797,9 @@ Ranges should be represented as compactly as possible. Ints must be no more than 2^32 - 1. + This field was first added in Tor 0.2.9.x. Some time after all earlier + Tor relay versions are obsolete, it will become mandatory. + 2.1.2. Extra-info document format Extra-info documents consist of the following items:

1 0

[tor/master] Merge remote-tracking branch 'ahf-oniongit/bugs/25026'
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit 7a74b3663fdaa40fc84e48990d15953a8f46a2bf Merge: b1fc383bd 162d75d58 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 25 13:57:37 2018 -0500 Merge remote-tracking branch 'ahf-oniongit/bugs/25026' changes/bug25026 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Update HiddenServiceVersion man-page entry to only accept either 2 or 3.
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit 162d75d5878d060f48102de05d0b94974744a932 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Jan 25 16:49:12 2018 +0100 Update HiddenServiceVersion man-page entry to only accept either 2 or 3. This patch updates the HiddenServiceVersion man-page entry to only accept either 2 or 3 as argument and not a list of multiple versions. See: https://bugs.torproject.org/25026 --- changes/bug25026 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug25026 b/changes/bug25026 new file mode 100644 index 000000000..24a64a562 --- /dev/null +++ b/changes/bug25026 @@ -0,0 +1,4 @@ + o Documentation: + - HiddenServiceVersion only accepts one version to be specified. This + version can either be version 2 or 3. Closes ticket 25026; bugfix on + 0.3.2.2-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8e27a25de..ef3d1eb9e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2670,7 +2670,7 @@ The following options are used to configure a hidden service. you're using a Tor controller that handles hidserv publishing for you. (Default: 1) -[[HiddenServiceVersion]] **HiddenServiceVersion** __version__,__version__,__...__:: +[[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**:: A list of rendezvous service descriptor versions to publish for the hidden service. Currently, versions 2 and 3 are supported. (Default: 2)

1 0

[tor/master] Bump version to 0.3.3.1-alpha-dev
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit b1fc383bdbb22526e5edfa5cc6b7a96a175fdde1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 25 13:50:55 2018 -0500 Bump version to 0.3.3.1-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 8af14fdb2..3cb187b0e 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.3.1-alpha]) +AC_INIT([tor],[0.3.3.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 543572896..f4d18a77d 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.3.1-alpha" +!define VERSION "0.3.3.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 5c2efb580..a4767e54c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.3.1-alpha" +#define VERSION "0.3.3.1-alpha-dev"

1 0

[webwml/master] 0.3.3.1-alpha is released.
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit 59a33abb4ddc5225d0656057b0dfab9ce6f3a168 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 25 13:45:18 2018 -0500 0.3.3.1-alpha is released. --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 062a8e97..79d21f99 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.2.9 -#export DEVTAG=tor-0.3.2.8-rc +export DEVTAG=tor-0.3.3.1-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 57965842..9f1097c3 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.2.9</define-tag> - +<define-tag version-alpha whitespace=delete>0.3.3.1-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[tor/master] We do not put a colon here.
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit e063dacc92ec2d49ea266fbb8f6e53d525963e70 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 25 11:55:49 2018 -0500 We do not put a colon here. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7a89aca6b..848ac2b88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.3.1-alpha - 2018-01-25: +Changes in version 0.3.3.1-alpha - 2018-01-25 Tor 0.3.3.1-alpha is the first release in the 0.3.3.x series. It adds several new features to Tor, including several improvements to bootstrapping, and support for an experimental "vanguards" feature to

1 0

[tor/master] Reflow changelog
by nickm＠torproject.org 25 Jan '18

25 Jan '18

commit de8bc9eed6eaadfca33381e9b5b6c06fa432e7b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 25 13:27:49 2018 -0500 Reflow changelog --- ChangeLog | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 848ac2b88..96629e37f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,11 +22,10 @@ Changes in version 0.3.3.1-alpha - 2018-01-25 consensus. This information makes it easier for IPv6 clients to bootstrap and choose reachable entry guards. Implements 23826. - Add consensus method 28, which removes IPv6 ORPorts from - microdescriptors. Now that the consensus contains IPv6 - ORPorts, they are redundant in microdescs. This change will be - used by Tor clients on 0.2.8.x and later. (That is to say, with - all Tor clients having IPv6 bootstrap and guard support.) - Implements 23828. + microdescriptors. Now that the consensus contains IPv6 ORPorts, + they are redundant in microdescs. This change will be used by Tor + clients on 0.2.8.x and later. (That is to say, with all Tor + clients having IPv6 bootstrap and guard support.) Implements 23828. - Expand the documentation for AuthDirHasIPv6Connectivity when it is set by different numbers of authorities. Fixes 23870 on 0.2.4.1-alpha. @@ -44,8 +43,8 @@ Changes in version 0.3.3.1-alpha - 2018-01-25 service circuits to a list of nodes. The option HSLayer2Guards pins the second hop, and the option HSLayer3Guards pins the third hop. These options are for use in conjunction with experiments - with "vanguards" for preventing guard enumeration attacks. - Closes ticket 13837. + with "vanguards" for preventing guard enumeration attacks. Closes + ticket 13837. o Major features (rust, portability, experimental): - Tor now ships with an optional implementation of one of its @@ -384,9 +383,9 @@ Changes in version 0.3.3.1-alpha - 2018-01-25 - The majority of the channel unit tests have been rewritten and the code coverage has now been raised to 83.6% for channel.c. Closes ticket 23709. - - Remove other dead code from the channel subsystem: All - together, this cleanup has removed more than 1500 lines of code - overall and adding very little except for unit test. + - Remove other dead code from the channel subsystem: All together, + this cleanup has removed more than 1500 lines of code overall and + adding very little except for unit test. o Code simplification and refactoring (circuit rendezvous): - Split the client-size rendezvous circuit lookup into two

1 0

[tor-messenger-build/master] Update tor-launcher to 0.2.14.3
by arlo＠torproject.org 25 Jan '18

25 Jan '18

commit 62d6599a292d0f47b5fb14dc8f920eacfa4dc104 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Jan 25 12:00:20 2018 -0500 Update tor-launcher to 0.2.14.3 --- ChangeLog | 1 + projects/tor-launcher/build | 8 -------- projects/tor-launcher/config | 6 +----- projects/tor-launcher/default48.png | Bin 1178 -> 0 bytes projects/tor-launcher/logo.patch | 28 ---------------------------- projects/tor-launcher/messenger.png | Bin 2724 -> 0 bytes projects/tor-launcher/torbirdy.png | Bin 15844 -> 0 bytes 7 files changed, 2 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bed2b6..3b68030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ Tor Messenger 0.6.0b1 -- * Use the tor-browser-52.6.0esr-7.5-2-build1 tag on tor-browser * Use the THUNDERBIRD_52_6_0_RELEASE tag on comm-esr52 * Update tor-browser to 7.5 + * Update tor-launcher to 0.2.14.3 * Update tor-browser-build to d2dee35 * Update rbm to 5c89374 * Linux diff --git a/projects/tor-launcher/build b/projects/tor-launcher/build index 8735d33..0891389 100644 --- a/projects/tor-launcher/build +++ b/projects/tor-launcher/build @@ -5,13 +5,5 @@ cd [% project %]-[% c('version') %] [% IF c("var/tor_control_port") -%] patch -p1 < ../controlport.patch [% END -%] -[% IF c("var/tor-mail") -%] -cp ../torbirdy.png src/chrome/skin/tbb-logo.png -[% END -%] -[% IF c("var/tor-messenger") -%] -cp ../messenger.png src/chrome/skin/tbb-logo.png -cp ../default48.png src/chrome/skin/default48.png -[% END -%] -patch -p1 < ../logo.patch make package mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index de39ebb..1b7cb3b 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,15 +1,11 @@ # vim: filetype=yaml sw=2 -version: 0.2.12.3 +version: 0.2.14.3 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: gk.gpg tag_gpg_id: 1 filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" input_files: - - filename: torbirdy.png - - filename: messenger.png - - filename: default48.png - - filename: logo.patch - filename: controlport.patch content: '[% INCLUDE controlport.patch.tmpl -%]' refresh_input: 1 diff --git a/projects/tor-launcher/default48.png b/projects/tor-launcher/default48.png deleted file mode 100644 index 8381428..0000000 Binary files a/projects/tor-launcher/default48.png and /dev/null differ diff --git a/projects/tor-launcher/logo.patch b/projects/tor-launcher/logo.patch deleted file mode 100644 index 00b273b..0000000 --- a/projects/tor-launcher/logo.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css -index 646baa6..66a89a3 100644 ---- a/src/chrome/skin/network-settings.css -+++ b/src/chrome/skin/network-settings.css -@@ -89,8 +89,8 @@ button.firstAnswer { - - .tbb-logo { - list-style-image: url("chrome://torlauncher/skin/tbb-logo.png"); -- width: 115px; -- height: 80px; -+ width: 128px; -+ height: 96px; - margin-right: 20px; - } - -diff --git a/src/chrome/skin/progress.css b/src/chrome/skin/progress.css -index d718452..5706f4d 100644 ---- a/src/chrome/skin/progress.css -+++ b/src/chrome/skin/progress.css -@@ -23,7 +23,7 @@ dialog { - #tbb-icon { - list-style-image: url("chrome://torlauncher/skin/default48.png"); - width: 48px; -- height: 48px; -+ height: 36px; - } - - #progressDesc { diff --git a/projects/tor-launcher/messenger.png b/projects/tor-launcher/messenger.png deleted file mode 100644 index 3de3c93..0000000 Binary files a/projects/tor-launcher/messenger.png and /dev/null differ diff --git a/projects/tor-launcher/torbirdy.png b/projects/tor-launcher/torbirdy.png deleted file mode 100644 index 6fecc45..0000000 Binary files a/projects/tor-launcher/torbirdy.png and /dev/null differ

1 0

[tor-messenger-build/master] Bump to THUNDERBIRD_52_6_0_RELEASE
by arlo＠torproject.org 25 Jan '18

25 Jan '18

commit 18a19dfa008a02d64759e8880a4b41b99317be27 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Jan 25 11:29:30 2018 -0500 Bump to THUNDERBIRD_52_6_0_RELEASE --- ChangeLog | 11 ++++++----- projects/instantbird/0001-Set-Tor-Messenger-preferences.patch | 4 ++-- .../0002-Trac-21634-Autologin-default-should-be-false.patch | 4 ++-- projects/instantbird/0003-XMPP-in-band-registration.patch | 4 ++-- projects/instantbird/0004-Remove-search-from-UI.patch | 4 ++-- projects/instantbird/0005-Add-Tor-Messenger-branding.patch | 4 ++-- .../0006-Remove-option-for-configuring-account-picture.patch | 4 ++-- projects/instantbird/0007-Modify-top-protocol-defaults.patch | 4 ++-- projects/instantbird/0008-Modify-IRC-defaults.patch | 4 ++-- .../instantbird/0009-Do-not-set-default-XMPP-server.patch | 4 ++-- projects/instantbird/0010-Modify-themes.patch | 4 ++-- projects/instantbird/0011-Remove-logging-UI.patch | 4 ++-- projects/instantbird/0012-Cert-override.patch | 4 ++-- projects/instantbird/0013-Display-all-traffic-over-Tor.patch | 4 ++-- projects/instantbird/0014-Trac-17480-Content-sink.patch | 4 ++-- projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch | 4 ++-- ...Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch | 4 ++-- ...Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch | 4 ++-- ...018-Trac-17517-Use-different-color-for-Add-Exception.patch | 4 ++-- .../0019-Trac-21736-Hide-account-timestamp-from-message.patch | 4 ++-- ...Update-allowed-duplicated-files-for-Windows-and-Linu.patch | 4 ++-- .../0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch | 4 ++-- .../instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch | 4 ++-- projects/instantbird/config | 2 +- .../mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- projects/mozilla/0003-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0004-Updater-fixups-for-TM.patch | 4 ++-- ...Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 4 ++-- rbm.conf | 2 +- tor-browser-build | 2 +- 33 files changed, 66 insertions(+), 65 deletions(-) diff --git a/ChangeLog b/ChangeLog index 232ca08..7bed2b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ -Tor Messenger 0.5.0b2 -- +Tor Messenger 0.6.0b1 -- * All Platforms - * Use the tor-browser-52.5.2esr-7.0-2-build1 tag on tor-browser - * Use the THUNDERBIRD_52_5_2_RELEASE tag on comm-esr52 - * Update tor-browser to 7.0.11 - * Update tor-browser-build to 9b4ba82 + * Use the tor-browser-52.6.0esr-7.5-2-build1 tag on tor-browser + * Use the THUNDERBIRD_52_6_0_RELEASE tag on comm-esr52 + * Update tor-browser to 7.5 + * Update tor-browser-build to d2dee35 + * Update rbm to 5c89374 * Linux * Trac 23806: libotr.so and libgcrypt.so are using RPATH * Trac 23542: Add snowflake pt diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch index 6f72e3d..6ea4e22 100644 --- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch +++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch @@ -1,4 +1,4 @@ -From 9f237446ec634b48068b3e6ae3b1158fb7c3dd31 Mon Sep 17 00:00:00 2001 +From 34c6563cd7b3e482a17517b3dd9fab9e8f06b92a Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 14:30:41 -0400 Subject: [PATCH 01/22] Set Tor Messenger preferences @@ -574,5 +574,5 @@ index 127c86a662..68da4aaf28 100644 +#expand pref("torbrowser.version", __TOR_BROWSER_VERSION__); +#endif -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch index 8eba6f1..46312ee 100644 --- a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch +++ b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch @@ -1,4 +1,4 @@ -From 382b2ccb519d650b8522f6fdc660e752b30bd396 Mon Sep 17 00:00:00 2001 +From 824fe80284ebc88d8e4eb3a6796073958bbffff6 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 16 Nov 2015 20:37:53 -0800 Subject: [PATCH 02/22] Trac 21634: Autologin default should be false @@ -35,5 +35,5 @@ index d51df3225c..904d22ba57 100644 </wizard> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0003-XMPP-in-band-registration.patch b/projects/instantbird/0003-XMPP-in-band-registration.patch index 6c01ecb..c22157e 100644 --- a/projects/instantbird/0003-XMPP-in-band-registration.patch +++ b/projects/instantbird/0003-XMPP-in-band-registration.patch @@ -1,4 +1,4 @@ -From 7f4412b78fd81fa09f9f542965821b4c86e344cd Mon Sep 17 00:00:00 2001 +From 023e38c2518d3d5216d5971c9f563614c89851f4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:09:40 -0400 Subject: [PATCH 03/22] XMPP in-band registration @@ -392,5 +392,5 @@ index 43d0f19e3f..c46fb2f956 100644 + +<!ENTITY registerXMPP.label "Create this new account on the server"> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0004-Remove-search-from-UI.patch b/projects/instantbird/0004-Remove-search-from-UI.patch index d36d51b..8c74818 100644 --- a/projects/instantbird/0004-Remove-search-from-UI.patch +++ b/projects/instantbird/0004-Remove-search-from-UI.patch @@ -1,4 +1,4 @@ -From 04c1e1a846f69ff9cb58bfb28091ba4e5ed5ee92 Mon Sep 17 00:00:00 2001 +From c77757acbb98d1416bfde8331cd0b847f17e91f4 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 18:47:48 -0700 Subject: [PATCH 04/22] Remove search from UI @@ -60,5 +60,5 @@ index fad67c190b..cfe2405ea3 100644 <groupbox> <caption label="&configEditDesc.label;"/> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch index 7b7c061..5047158 100644 --- a/projects/instantbird/0005-Add-Tor-Messenger-branding.patch +++ b/projects/instantbird/0005-Add-Tor-Messenger-branding.patch @@ -1,4 +1,4 @@ -From 99a37597c2eac02cca973ddf4524510ed7c8f236 Mon Sep 17 00:00:00 2001 +From d184ad64581060a09abfc8b0b0eda896d3a3a9e3 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 15:46:51 -0400 Subject: [PATCH 05/22] Add Tor Messenger branding @@ -5121,5 +5121,5 @@ index 15ec569c11..4a2d35d8a1 100644 -Info=Instantbird is installing your updates and will start in a few moments… +Info=Tor Messenger is installing your updates and will start in a few moments… -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch index 7d4c39e..0bb61a0 100644 --- a/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch +++ b/projects/instantbird/0006-Remove-option-for-configuring-account-picture.patch @@ -1,4 +1,4 @@ -From abf2a50fcf5609d1796c1c5c44cf54e9e55822d5 Mon Sep 17 00:00:00 2001 +From 19fbccd930738129689db444c14caaa88256dd70 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:24:09 -0700 Subject: [PATCH 06/22] Remove option for configuring account picture @@ -22,5 +22,5 @@ index 843f1eef57..71ee2c9ef8 100644 <panel id="changeUserIconPanel" type="arrow" align="center" -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0007-Modify-top-protocol-defaults.patch b/projects/instantbird/0007-Modify-top-protocol-defaults.patch index 658ae86..e444aa5 100644 --- a/projects/instantbird/0007-Modify-top-protocol-defaults.patch +++ b/projects/instantbird/0007-Modify-top-protocol-defaults.patch @@ -1,4 +1,4 @@ -From 7b7403932473c5c039e24a425e9526e5895e195b Mon Sep 17 00:00:00 2001 +From 90fe8eddc70aebfd2fcd3a052cf671e1f2561693 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Wed, 26 Jul 2017 16:16:09 -0400 Subject: [PATCH 07/22] Modify top protocol defaults @@ -21,5 +21,5 @@ index 135b68386c..356321dbcc 100644 </hbox> </wizardpage> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0008-Modify-IRC-defaults.patch b/projects/instantbird/0008-Modify-IRC-defaults.patch index 407152a..dd69023 100644 --- a/projects/instantbird/0008-Modify-IRC-defaults.patch +++ b/projects/instantbird/0008-Modify-IRC-defaults.patch @@ -1,4 +1,4 @@ -From 9ea545fd1f26cccb601f69f6d1955bb27d31098a Mon Sep 17 00:00:00 2001 +From 117f184e742b0cd567088abc19f6f3cd062b69da Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:31:58 -0700 Subject: [PATCH 08/22] Modify IRC defaults @@ -61,5 +61,5 @@ index 43ed2ced4b..c2f16bee84 100644 ". Sending TIME response: \"" + now + "\"."); this.sendCTCPMessage(aMessage.origin, true, "TIME", ":" + now); -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch index f4e4a00..610008f 100644 --- a/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch +++ b/projects/instantbird/0009-Do-not-set-default-XMPP-server.patch @@ -1,4 +1,4 @@ -From 7a305b78ea440ca86de6819ef52e3ccbda8fc8e2 Mon Sep 17 00:00:00 2001 +From 76067dc0b0923aa8f4944e2f995cb6427357fccf Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri, 28 Jul 2017 12:11:57 -0400 Subject: [PATCH 09/22] Do not set default XMPP server @@ -21,5 +21,5 @@ index 2afb15f059..1d2c167d3e 100644 options: { -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0010-Modify-themes.patch b/projects/instantbird/0010-Modify-themes.patch index ce9fd8a..24e5953 100644 --- a/projects/instantbird/0010-Modify-themes.patch +++ b/projects/instantbird/0010-Modify-themes.patch @@ -1,4 +1,4 @@ -From fb6803d8639fe4ff584bbe3c1a9c52cd93a81df5 Mon Sep 17 00:00:00 2001 +From 3de3d95ce980f03c92c7f97776c605c1107e7dde Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:36:38 -0700 Subject: [PATCH 10/22] Modify themes @@ -74,5 +74,5 @@ index 454e366960..18ba1f95cc 100644 <separator class="thin"/> <description>&emoticonsPreview.description;</description> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0011-Remove-logging-UI.patch b/projects/instantbird/0011-Remove-logging-UI.patch index 82a9892..f6cfb9f 100644 --- a/projects/instantbird/0011-Remove-logging-UI.patch +++ b/projects/instantbird/0011-Remove-logging-UI.patch @@ -1,4 +1,4 @@ -From 1562db21593cc47a639da5b55ddf54557d948a5b Mon Sep 17 00:00:00 2001 +From 0d06dd933e8d0a28390dff7ec2f781490938995b Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:50:48 -0700 Subject: [PATCH 11/22] Remove logging UI @@ -39,5 +39,5 @@ index 7c9db1cdd8..2d7b2701ea 100644 <groupbox id="passwordsGroup" orient="vertical"> <caption label="&passwords.label;"/> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0012-Cert-override.patch b/projects/instantbird/0012-Cert-override.patch index fc340b5..9a39ae5 100644 --- a/projects/instantbird/0012-Cert-override.patch +++ b/projects/instantbird/0012-Cert-override.patch @@ -1,4 +1,4 @@ -From 814e75470821e326bd3636c4c7279eb54c963759 Mon Sep 17 00:00:00 2001 +From 4444763ae6d5d8455a2480c55f0a3ebc18975158 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:56:46 -0700 Subject: [PATCH 12/22] Cert override @@ -60,5 +60,5 @@ index def78c809c..614d52bca2 100644 #ifdef XP_MACOSX @RESPATH@/components/ibDockBadge.js -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch index 2db1eef..8141c92 100644 --- a/projects/instantbird/0013-Display-all-traffic-over-Tor.patch +++ b/projects/instantbird/0013-Display-all-traffic-over-Tor.patch @@ -1,4 +1,4 @@ -From 1a887000b91677fc9ff36fbaefc304b6a0aa67fc Mon Sep 17 00:00:00 2001 +From e10f2a3843c865ff29f93f3b9b9043fcc1dc0865 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 10 Oct 2016 19:58:31 -0700 Subject: [PATCH 13/22] Display all traffic over Tor @@ -34,5 +34,5 @@ index c46fb2f956..6b49c84fad 100644 <!ENTITY accountProtocolShowMore.label "Show all protocols"> <!ENTITY accountProtocolShowMore.description "Choose from the full list of protocols"> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0014-Trac-17480-Content-sink.patch b/projects/instantbird/0014-Trac-17480-Content-sink.patch index 8c29f66..13abea0 100644 --- a/projects/instantbird/0014-Trac-17480-Content-sink.patch +++ b/projects/instantbird/0014-Trac-17480-Content-sink.patch @@ -1,4 +1,4 @@ -From 72f5121499c3e56e7d4f46ba61733ce9fe963e6a Mon Sep 17 00:00:00 2001 +From db2e3298866a97da24b404346afdfa45b4950434 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 5 Oct 2016 11:09:25 -0700 Subject: [PATCH 14/22] Trac 17480: Content sink @@ -107,5 +107,5 @@ index 3b8ccfa2b3..ba41da76aa 100644 <menuitem value="0" label="&filterLevelNone;"/> </menupopup> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch index 0fddfb0..42ba83e 100644 --- a/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch +++ b/projects/instantbird/0015-SASL-ECDSA-NIST256P-CHALLENGE.patch @@ -1,4 +1,4 @@ -From b82d9d43ab3029d134838b84aac30b19dee7fe67 Mon Sep 17 00:00:00 2001 +From 99a60a16cde347122930dbf462a2de8ce265265d Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 2 Oct 2016 08:46:55 -0700 Subject: [PATCH 15/22] SASL ECDSA-NIST256P-CHALLENGE @@ -8915,5 +8915,5 @@ index bc25396873..e46815dfe3 100644 'ircCAP.jsm', 'ircCommands.jsm', -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch index d5c1be9..0dcb826 100644 --- a/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch +++ b/projects/instantbird/0016-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch @@ -1,4 +1,4 @@ -From f725ff8d023e462ee31ff258fa44867d750df413 Mon Sep 17 00:00:00 2001 +From 7b3e3521314764e3e79ec1571b2d52dafdbee0a7 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Tue, 29 Aug 2017 14:45:29 -0400 Subject: [PATCH 16/22] Bug 1321641 - Use built-in functions instead of an svg @@ -53,5 +53,5 @@ index 80421b8ca2..6520757ddd 100644 .indicator { -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch index a09ac59..56be5eb 100644 --- a/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch +++ b/projects/instantbird/0017-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch @@ -1,4 +1,4 @@ -From 8d33984c9d0158fb22e341de66d831a92d3e73cc Mon Sep 17 00:00:00 2001 +From 257faaee085297d838d3451857ab5b65c7ad854a Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 26 Jul 2017 16:35:33 -0400 Subject: [PATCH 17/22] Bug 1321420 - Add a pref to disable JavaScript in @@ -48,5 +48,5 @@ index c52c8c637d..0069219fa6 100644 Components.interfaces.nsIWebProgress.NOTIFY_ALL); let url = request.url; -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch index 2e03830..6250d1a 100644 --- a/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch +++ b/projects/instantbird/0018-Trac-17517-Use-different-color-for-Add-Exception.patch @@ -1,4 +1,4 @@ -From 04bde61de0e18c0d414bd770ec159b6bb0391761 Mon Sep 17 00:00:00 2001 +From a360d37b4abda463c32f6cb5586fdf94667f27f5 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Wed, 26 Jul 2017 16:38:19 -0400 Subject: [PATCH 18/22] Trac 17517 - Use different color for Add Exception @@ -19,5 +19,5 @@ index 807184209b..8ce7f9ad81 100644 + color: #fff; +} -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch index 5427ec5..a380206 100644 --- a/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch +++ b/projects/instantbird/0019-Trac-21736-Hide-account-timestamp-from-message.patch @@ -1,4 +1,4 @@ -From c25dc351a7505de41b738deeef91a3108151ccaf Mon Sep 17 00:00:00 2001 +From 96c94a4c3cca3caf7b326254c4ff2745dc430913 Mon Sep 17 00:00:00 2001 From: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Sun, 2 Apr 2017 13:07:09 -0400 Subject: [PATCH 19/22] Trac 21736 - Hide account/timestamp from message @@ -60,5 +60,5 @@ index 68da4aaf28..19334b382a 100644 /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch index 002eab4..d32a054 100644 --- a/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch +++ b/projects/instantbird/0020-Update-allowed-duplicated-files-for-Windows-and-Linu.patch @@ -1,4 +1,4 @@ -From c6a68a1a30bf8f9712267fc8eb3f8c3593129f9f Mon Sep 17 00:00:00 2001 +From 646047420aea51535d91c09ed7aaf0011c6fd0ea Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu, 27 Jul 2017 15:16:54 -0400 Subject: [PATCH 20/22] Update allowed duplicated files for Windows and Linux @@ -94,5 +94,5 @@ index 988dc2d35a..940418bc9d 100644 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn # and mail/installer/allowed-dupes.mn: -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch index 033e8b2..06d2af5 100644 --- a/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch +++ b/projects/instantbird/0021-Bug-13855-Use-known-onions-for-XMPP-servers.patch @@ -1,4 +1,4 @@ -From 929040712ccff38035bd0467dd88bade4df9d968 Mon Sep 17 00:00:00 2001 +From b6e51b8b315b26ceb0e93c65b132e3479cc64ea0 Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue, 15 Aug 2017 16:40:33 -0400 Subject: [PATCH 21/22] Bug 13855: Use known onions for XMPP servers @@ -138,5 +138,5 @@ index efb0b77aee..05a4deb462 100644 + +onionAddress.label=%S is %S's onion address. -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch index 0b60d89..6f8fd36 100644 --- a/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch +++ b/projects/instantbird/0022-Bug-16606-Automatic-XMPP-accounts.patch @@ -1,4 +1,4 @@ -From 9047105e20c92a5d19a530767fabc589e42c0243 Mon Sep 17 00:00:00 2001 +From 27b4c11fd2587708dde1a4034044e2358a18a2ba Mon Sep 17 00:00:00 2001 From: Sukhbir Singh <sukhbir(a)torproject.org> Date: Mon, 21 Aug 2017 23:00:07 -0400 Subject: [PATCH 22/22] Bug 16606: Automatic XMPP accounts @@ -166,5 +166,5 @@ index 6b49c84fad..de7fe8ed11 100644 <!ENTITY registerXMPP.label "Create this new account on the server"> +<!ENTITY tempXMPP.label "Create a temporary account automatically"> -- -2.15.1 +2.16.1 diff --git a/projects/instantbird/config b/projects/instantbird/config index af76c55..446330c 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' hg_url: https://hg.mozilla.org/releases/comm-esr52/ -hg_hash: THUNDERBIRD_52_5_2_RELEASE +hg_hash: THUNDERBIRD_52_6_0_RELEASE filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %]" var: diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index a65b534..e78e36b 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From 3c602b58475e59fceec154d726883b977e10f0ee Mon Sep 17 00:00:00 2001 +From 6ee07445bcfa1ef74934ecc7a7862afd10d0927d Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Fri, 1 Sep 2017 17:39:04 -0400 Subject: [PATCH 1/5] Trac 19910: Prevents STARTTLS in XMPP @@ -115,5 +115,5 @@ index a21dfa4a5a11..5429637c1c3a 100644 void SetNamedPipeFD(PRFileDesc *fd) { mFD = fd; } -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 1101f3c..5c24cdb 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From fe815268d93c2811701fd75ab22af59224fdf742 Mon Sep 17 00:00:00 2001 +From a1f8139363a279d8c948ef621e860e306eca2167 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/5] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index cd1707beaf5f..d014832e0595 100644 } -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch index 3169a3c..ce7636d 100644 --- a/projects/mozilla/0003-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0003-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From 6ad2adc7411088f3292e35bcf61bee81da9dd252 Mon Sep 17 00:00:00 2001 +From 4502122ff76eb1c6de00f3db49b6ff3121f1e9ce Mon Sep 17 00:00:00 2001 From: Nicolas Vigier <boklm(a)torproject.org> Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 3/5] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 51633178226c..64584f579390 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/0004-Updater-fixups-for-TM.patch b/projects/mozilla/0004-Updater-fixups-for-TM.patch index 14af5e9..305bc0f 100644 --- a/projects/mozilla/0004-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0004-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From ae52907f0690ad6bd2e1b1a1cf873988b75db227 Mon Sep 17 00:00:00 2001 +From 26c0c11d82d4192f68cdb87ea4dd2d5f6f6d52e3 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Fri, 1 Sep 2017 17:45:40 -0400 Subject: [PATCH 4/5] Updater fixups for TM @@ -804,5 +804,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index d1ca4cd..1e327f6 100644 --- a/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From fa4d583dcdebc6c7bcea3913123751dad50932ac Mon Sep 17 00:00:00 2001 +From bd9333d8dfd64559b4d33f06b3871740104259f5 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sat, 3 Dec 2016 10:01:52 -0800 Subject: [PATCH 5/5] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 0ca24a614dca..df50701729ce 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.15.1 +2.16.1 diff --git a/projects/mozilla/config b/projects/mozilla/config index ce97d5f..39a2f81 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-52.5.2esr-7.0-2-build1 +version: tor-browser-52.6.0esr-7.5-2-build1 filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git git_hash: '[% c("version") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 341df9f..56c4171 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 7.0.11 +version: 7.5 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files: @@ -22,7 +22,7 @@ var: steps: tor-browser-alpha: tor-browser-alpha: '[% INCLUDE build %]' - version: 7.5a10 + version: 8.0a1 targets: linux-x86_64: diff --git a/rbm.conf b/rbm.conf index b108c6f..74af21e 100644 --- a/rbm.conf +++ b/rbm.conf @@ -14,7 +14,7 @@ buildconf: num_procs: '[% GET ENV.RBM_NUM_PROCS ? ENV.RBM_NUM_PROCS : "8" %]' var: - tormessenger_version: '0.5.0b2' + tormessenger_version: '0.6.0b1' copyright_year: '2018' project_name: tor-messenger multi_lingual: 0 diff --git a/tor-browser-build b/tor-browser-build index c4db919..d2dee35 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit c4db919cd945f421f36ec1c358bce15ecc192590 +Subproject commit d2dee352354ee77cd26ac37bef41322df2729ff8

1 0