April 2017 - tor-commits - lists.torproject.org

[webwml/master] Add new Tor Browser version: 7.0a3
by boklm＠torproject.org 20 Apr '17

20 Apr '17

commit 519da837f714d7d5dd2897b507412271b6fece74 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 20 13:53:32 2017 +0200 Add new Tor Browser version: 7.0a3 --- include/versions.wmi | 20 ++++++++++---------- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 59dd3d2..25dd28b 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -5,29 +5,29 @@ <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.5</define-tag> <define-tag version-torbrowserbundledir whitespace=delete>6.5.2</define-tag> -<define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a2</define-tag> +<define-tag version-torbrowserbundlebetadir whitespace=delete>7.0a3</define-tag> <define-tag version-torbrowserbundle whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundle whitespace=delete>2017-04-19</define-tag> -<define-tag version-torbrowserbundlebeta whitespace=delete>7.0a2</define-tag> -<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-03-08</define-tag> +<define-tag version-torbrowserbundlebeta whitespace=delete>7.0a3</define-tag> +<define-tag releasedate-torbrowserbundlebeta whitespace=delete>2017-04-20</define-tag> <define-tag version-torbrowserbundlelinux32 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-04-19</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-03-08</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-03-08</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.0a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-04-20</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.0a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-04-20</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-04-19</define-tag> <define-tag version-torbrowserbundleosx64 whitespace=delete>6.5.2</define-tag> <define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-04-19</define-tag> -<define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a2</define-tag> -<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-03-08</define-tag> -<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.3</define-tag> +<define-tag version-torbrowserbundleosx64beta whitespace=delete>7.0a3</define-tag> +<define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2017-04-20</define-tag> +<define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.6</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/torbrowser/<version-torbrowserbundledir>/tor-win32-<version-win32-stable>.zip</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index bf79c79..925a307 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -12,5 +12,9 @@ "7.0a2-MacOS", "7.0a2-Windows", "7.0a2-hardened", -"7.0a2-hardened-Linux" +"7.0a2-hardened-Linux", +"7.0a3", +"7.0a3-Linux", +"7.0a3-MacOS", +"7.0a3-Windows" ]

1 0

[webwml/master] Remove Hardened Tor Browser from the download page
by boklm＠torproject.org 20 Apr '17

20 Apr '17

commit bede5eecf8cb0e496afe14a5848ba1a0801f4abc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 20 13:50:39 2017 +0200 Remove Hardened Tor Browser from the download page --- projects/en/torbrowser.wml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index 6b85a33..f4073e9 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -540,30 +540,6 @@ </div> <hr> <p></p> - <div id="downloads-hardened" class="anchor"></div> - <center><h3>Hardened Tor Browser</h3></center> - <div class="pjtext"> - <div class="dltable" style="margin-top: -35px;"> - <table> - <thead> - <tr> - <th><br>Language</th> - <th>Linux<br><em>(<version-torbrowserbundlelinux64beta>-hardened)</em></th> - </tr> - </thead> - <tbody> - <tr class="alt"> - <td>All</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundlebetadir>-hardened/tor-browser-linux64-<version-torbrowserbundlelinux64beta>-hardened_ALL.tar.xz">64-bit</a> - <em>(<a href="../dist/torbrowser/<version-torbrowserbundlebetadir>-hardened/tor-browser-linux64-<version-torbrowserbundlelinux64beta>-hardened_ALL.tar.xz.asc">sig</a>)</em> - </td> - </tr> - </tbody> - </table> - </div> - </div> - <hr> - <p></p> <div id="downloads-sandbox" class="anchor"></div> <center><h3>Tor Browser Sandbox</h3></center> <div class="pjtext">

1 0

[meek/master] Modify http.DefaultTransport directly, don't use a copy.
by dcf＠torproject.org 20 Apr '17

20 Apr '17

commit 0ee2dfb6e2868c432fbe05e8ee8080584e8e03d2 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Apr 19 22:59:07 2017 -0700 Modify http.DefaultTransport directly, don't use a copy. I don't see a reason to make a copy when this is all we use; also "go vet" complained: meek-client.go:403: assignment copies lock value to httpTransport: net/http.Transport contains sync.Mutex --- meek-client/meek-client.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index 8cbc84a..c3eadc4 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -82,9 +82,10 @@ const ( var ptInfo pt.ClientInfo -// This is the RoundTripper used to make all our requests (when --helper is not -// used). -var httpTransport http.Transport +// We use this RoundTripper to make all our requests (when --helper is not +// used). We use the defaults, except we take control of the Proxy setting +// (notably, disabling the default ProxyFromEnvironment). +var httpTransport *http.Transport = http.DefaultTransport.(*http.Transport) // Store for command line options. var options struct { @@ -396,11 +397,8 @@ func main() { } } - // We make a copy of DefaultTransport because we want the default Dial - // and TLSHandshakeTimeout settings. But we want to disable the default - // ProxyFromEnvironment setting. Proxy is overridden below if - // options.ProxyURL is set. - httpTransport = *http.DefaultTransport.(*http.Transport) + // Disable the default ProxyFromEnvironment setting. httpTransport.Proxy + // is overridden below if options.ProxyURL is set. httpTransport.Proxy = nil // Command-line proxy overrides managed configuration.

1 0

[meek/master] fmt
by dcf＠torproject.org 20 Apr '17

20 Apr '17

commit 7c239cfb174080df475435343ad1202af75a41b3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Apr 20 00:50:04 2017 -0700 fmt --- meek-server/meek-server.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index d0be266..2b49897 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -273,7 +273,7 @@ func (state *State) ExpireSessions() { } } -func listenTLS(network string, addr *net.TCPAddr, getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { +func listenTLS(network string, addr *net.TCPAddr, getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { // This is cribbed from the source of net/http.Server.ListenAndServeTLS. // We have to separate the Listen and Serve parts because we need to // report the listening address before entering Serve (which is an @@ -307,7 +307,7 @@ func startListener(network string, addr *net.TCPAddr) (net.Listener, error) { return startServer(ln) } -func startListenerTLS(network string, addr *net.TCPAddr, getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { +func startListenerTLS(network string, addr *net.TCPAddr, getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error)) (net.Listener, error) { ln, err := listenTLS(network, addr, getCertificate) if err != nil { return nil, err @@ -386,7 +386,7 @@ func main() { // The outputs of this block of code are the disableTLS, // missing443Listener, and getCertificate variables. var missing443Listener = false - var getCertificate func (*tls.ClientHelloInfo) (*tls.Certificate, error) + var getCertificate func(*tls.ClientHelloInfo) (*tls.Certificate, error) if disableTLS { if acmeEmail != "" || acmeHostnamesCommas != "" || certFilename != "" || keyFilename != "" { log.Fatalf("The --acme-email, --acme-hostnames, --cert, and --key options are not allowed with --disable-tls.")

1 0

[tor-browser-build/master] Bump sandboxed to browser tag to 0.0.6
by boklm＠torproject.org 20 Apr '17

20 Apr '17

commit 41a5df93e6c92b3481057f077201472caef8b9e5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 20 09:44:20 2017 +0200 Bump sandboxed to browser tag to 0.0.6 tor-browser-bundle.git commit: 947fedb72f4a43b46fcc2e72531db79e8aa7d943 --- projects/sandbox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/sandbox/config b/projects/sandbox/config index 9dc52c6..218a276 100644 --- a/projects/sandbox/config +++ b/projects/sandbox/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.0.5 +version: 0.0.6 git_url: https://git.torproject.org/tor-browser/sandboxed-tor-browser git_hash: 'sandboxed-tor-browser-[% c("version") %]' tag_gpg_id: 1

1 0

[tor-browser-build/master] Pick up build3 from Mozilla and bug fixes
by boklm＠torproject.org 20 Apr '17

20 Apr '17

commit da2bb257968d238a538ebc6ddfb7da2e35041985 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 20 09:47:04 2017 +0200 Pick up build3 from Mozilla and bug fixes tor-browser-bundle.git commit: 421091532d3536893e715f62cab9055cd822b95a --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..39f04cb 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build3 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 14c1cd5..2c74e4b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git gpg_keyring: torbutton.gpg

1 0

[tor-browser-bundle/master] Bump sandboxed to browser tag to 0.0.6
by gk＠torproject.org 20 Apr '17

20 Apr '17

commit 947fedb72f4a43b46fcc2e72531db79e8aa7d943 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 20 06:50:18 2017 +0000 Bump sandboxed to browser tag to 0.0.6 --- gitian/versions.alpha | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index fffb050..d1ea48b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -41,7 +41,7 @@ OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e -SANDBOX_TAG=sandboxed-tor-browser-0.0.5 +SANDBOX_TAG=sandboxed-tor-browser-0.0.6 DEPOT_TOOLS_TAG=28216cd14b44716db5c83634afbdc6e90492652b WEBRTC_TAG=c279861207c5b15fc51069e96595782350e0ac12 # https://chromium.googlesource.com/external/webrtc.git/+/refs/branch-heads/58 GO_WEBRTC_TAG=ab1b64862e0c4b4182010699911c2c5818f0a101

1 0

[sandboxed-tor-browser/master] Do the release ritual for sandboxed-tor-browser-0.0.6.
by yawning＠torproject.org 20 Apr '17

20 Apr '17

commit 65135ee0f5ebb914bb5160bd3ed641169a208fa8 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Thu Apr 20 04:51:51 2017 +0000 Do the release ritual for sandboxed-tor-browser-0.0.6. --- ChangeLog | 2 +- data/version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a0f16bc..a04ee94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.6 - UNRELEASED: +Changes in version 0.0.6 - 2017-04-19: * Add back the old release MAR signing key. Changes in version 0.0.5 - 2017-04-13: diff --git a/data/version b/data/version index 4575aad..1750564 100644 --- a/data/version +++ b/data/version @@ -1 +1 @@ -0.0.6-dev +0.0.6

1 0

[tor-messenger-build/master] Bump tags for ESR 45.9.0
by arlo＠torproject.org 19 Apr '17

19 Apr '17

commit 8e52e53ceaf8d8ef3f2e8d8c49fdf1252b78eeb8 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Apr 19 17:43:15 2017 -0400 Bump tags for ESR 45.9.0 --- ChangeLog | 2 ++ projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- .../0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 4 ++-- .../0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 4 ++-- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0006-Updater-fixups-for-TM.patch | 4 ++-- .../0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch | 4 ++-- projects/mozilla/config | 2 +- projects/tor-browser/config | 2 +- 10 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa9197d..bbbb088 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Tor Messenger 0.4.0b3 -- * All Platforms + * Use the tor-browser-45.9.0esr-6.5-1-build3 tag on tor-browser + * Update tor-browser to 6.5.2 * Add some missing localization for Twitter's actions * Trac 21736: Hide the timestamp and account from message selection templates 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 bd10b77..68a4a68 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 d7324cb7d256053d8fee8640db6735e2637c8a44 Mon Sep 17 00:00:00 2001 +From 3d87efd8e803a273e823fb614279dce106c6e025 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP @@ -116,5 +116,5 @@ index 568c700e2bae..1793001df2c9 100644 private: -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index a8390b3..1820c42 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 f63790c8c4fc4df231845ce88ece94740c6db0c1 Mon Sep 17 00:00:00 2001 +From bfa290a2ec4dfaac469082c4039f3f3fb40c01ea 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/7] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index 5345ce7c8764..15692365ee63 100644 } -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index b432fc0..482f7ac 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From cdb8439f55dd55d9c7d9bf4787d3fff2be39578b Mon Sep 17 00:00:00 2001 +From 283a2e77d639da7eacdef33e662b2cf88960561b Mon Sep 17 00:00:00 2001 From: Jonathan Kew <jkew(a)mozilla.com> Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka @@ -61,5 +61,5 @@ index e3d98b13c6de..fc8ca9d14656 100644 // optimization hint for fonts with localized names to be read in at startup, otherwise read in at lookup miss // names are canonical family names (typically English names) -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 0b6e851..e6e8535 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From e3d76abbb2c87689671f8cf0c685f847afa62c2b Mon Sep 17 00:00:00 2001 +From a65ab3c9a3941ebe6dc96215f6929c94f57c9568 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45 @@ -119,5 +119,5 @@ index 0e4d118523c8..e0ad0d3c0365 100644 /* * gcc atomic ops. These are available on several other compilers as well. -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 003e5ff..efd5d96 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From a8b8203b05477cea7b1102726a8cc581512c22e8 Mon Sep 17 00:00:00 2001 +From f6c4d4176d03a8b528bfc5342f538506c02f01c6 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 5/7] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 5c11ed2ef2ec..0c7bf282baab 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index 665486e..52a0f18 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 7a39e91c507ae3655ee8ef2dfe919b9bb409dc9a Mon Sep 17 00:00:00 2001 +From d45245d692854faa9574014cab658e935e8537e1 Mon Sep 17 00:00:00 2001 From: Arlo Breault <arlolra(a)gmail.com> Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/7] Updater fixups for TM @@ -803,5 +803,5 @@ index c45961ac54e7..23d6fbe2929a 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch index a866f76..973d8d9 100644 --- a/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch +++ b/projects/mozilla/0007-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch @@ -1,4 +1,4 @@ -From cdbfa65631576f1d5076cf2011f4d44810040730 Mon Sep 17 00:00:00 2001 +From 1fc38f7c038bdc501943e42b7ec3752aa4a732a3 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 7/7] Permit storing exceptions even w/ inPrivateBrowsingMode @@ -20,5 +20,5 @@ index 640791f898fc..a8abfe9886c4 100644 + return false; // PrivateBrowsingUtils.isWindowPrivate(window); } -- -2.12.0 +2.12.2 diff --git a/projects/mozilla/config b/projects/mozilla/config index 519276f..29e172e 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: tor-browser-45.8.0esr-6.5-2-build1 +version: tor-browser-45.9.0esr-6.5-1-build3 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 136178c..3b1f7b5 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 6.5.1 +version: 6.5.2 filename: 'tor-browser-[% c("version") %]-[% c("var/osname") %].[% c("var/extension") %]' input_files:

1 0

[sandboxed-tor-browser/master] Add back the old release MAR signing key.
by yawning＠torproject.org 19 Apr '17

19 Apr '17

commit c9fc6212512761126edb874aee7e2ff0fecbd4f1 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Apr 19 20:40:39 2017 +0000 Add back the old release MAR signing key. You are in a maze of twisty public keys, all alike. When I pulled in the new MAR signing key (b32fb3a83a4fcc60cf05c0c41a7b7b67ada704cd not actually used yet), I should have preserved all existing keys, because they're all used for various things. In this case, the key that got obliterated is the one currently being used to sign MARs for the `release` channel. --- ChangeLog | 1 + data/installer/release_primary_6.5.der | Bin 0 -> 1229 bytes src/cmd/sandboxed-tor-browser/internal/installer/mar.go | 11 +++++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09740c4..a0f16bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.6 - UNRELEASED: + * Add back the old release MAR signing key. Changes in version 0.0.5 - 2017-04-13: * Bug 21764: Use bubblewrap's `--die-with-parent` when supported. diff --git a/data/installer/release_primary_6.5.der b/data/installer/release_primary_6.5.der new file mode 100644 index 0000000..542fb24 Binary files /dev/null and b/data/installer/release_primary_6.5.der differ diff --git a/src/cmd/sandboxed-tor-browser/internal/installer/mar.go b/src/cmd/sandboxed-tor-browser/internal/installer/mar.go index 3f9c610..60d114d 100644 --- a/src/cmd/sandboxed-tor-browser/internal/installer/mar.go +++ b/src/cmd/sandboxed-tor-browser/internal/installer/mar.go @@ -28,11 +28,6 @@ import ( "cmd/sandboxed-tor-browser/internal/data" ) -const ( - tbbMARReleasePrimaryAsset = "installer/release_primary.der" - tbbMARReleaseSecondaryAsset = "installer/release_secondary.der" -) - var tbbMARCerts []*x509.Certificate // VerifyTorBrowserMAR validates the MAR signature against the TBB MAR signing @@ -139,7 +134,11 @@ func VerifyTorBrowserMAR(mar []byte) error { } func init() { - assets := []string{tbbMARReleasePrimaryAsset, tbbMARReleaseSecondaryAsset} + assets := []string{ + "installer/release_primary_6.5.der", // Stable MAR signing key. + "installer/release_primary.der", // (Unused) MAR signing key. + "installer/release_secondary.der", // Alpha MAR signing key (7.0). + } for _, asset := range assets { if der, err := data.Asset(asset); err != nil {

1 0