- tbb-commits - lists.torproject.org

[tor-browser-spec/master] Bug 31606: Don't update Tor Browser release date on the website
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 44866943861e1da1959c06e711c8be4b222eee91 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 14:05:14 2019 +0200 Bug 31606: Don't update Tor Browser release date on the website The new website does not include the Tor Browser release date, so there is no need to update it. --- processes/ReleaseProcess | 1 - 1 file changed, 1 deletion(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index a358959..41e268d 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -144,7 +144,6 @@ torsocks git pull origin # Update `version-win32-stable` as well if we include a new stable tor # version. See: #14152. - # Update the release date (via releasedate-torbrowserbundle*). See: #8968. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr

1 0

[tor-browser-spec/master] Bug 31606: Fix instructions for updating the Windows Expert Bundle version
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 23c956584436ec12795af873aef02a700d49cf20 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Sep 3 14:09:11 2019 +0200 Bug 31606: Fix instructions for updating the Windows Expert Bundle version --- processes/ReleaseProcess | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 41e268d..c183c9a 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -142,8 +142,9 @@ #. Update website's torbrowser versions file in the website git cd tpo torsocks git pull origin - # Update `version-win32-stable` as well if we include a new stable tor - # version. See: #14152. + # Update `win32` in the `torbrowser-stable` section as well if we + # include a new stable tor version (called the Windows Expert Bundle + # on the website). See: #14152. # In the RecommendedTBBVersions file, only add the new version. Don't # remove the old one yet. That comes later. vim databags/versions.ini content/projects/torbrowser/RecommendedTBBVersions/contents.lr

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 1330467 - part 7. Confirm FPI in permission manager tests; r=Ehsan
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit a8c2fe1a361abb926e6dbbce91940a1c56b0b9bf Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 09:41:37 2019 +0200 fixup! Bug 1330467 - part 7. Confirm FPI in permission manager tests; r=Ehsan --- extensions/permissions/test/unit/test_permmanager_defaults.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/permissions/test/unit/test_permmanager_defaults.js b/extensions/permissions/test/unit/test_permmanager_defaults.js index cfd42f49e92a..c586982a133c 100644 --- a/extensions/permissions/test/unit/test_permmanager_defaults.js +++ b/extensions/permissions/test/unit/test_permmanager_defaults.js @@ -156,11 +156,12 @@ add_task(async function do_test() { Ci.nsIPermissionManager.ALLOW_ACTION, pm.testPermissionFromPrincipal(principal4, TEST_PERMISSION) ); - // make sure principals with a firstPartyDomain use different permissions + // make sure principals with userContextId use the same permissions Assert.equal( Ci.nsIPermissionManager.ALLOW_ACTION, pm.testPermissionFromPrincipal(principal6, TEST_PERMISSION) ); + // make sure principals with a firstPartyDomain use different permissions Assert.equal( Ci.nsIPermissionManager.UNKNOWN_ACTION, pm.testPermissionFromPrincipal(principal7, TEST_PERMISSION)

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit 5b5b014217a2df562ea4551ae68d0bc267cedf97 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Sep 3 09:12:56 2019 +0200 squash! TB4: Tor Browser's Firefox preference overrides. Bug 31065: Explicitly allow proxying localhost --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0d84455051e5..6c2d2476e1b3 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -173,6 +173,7 @@ pref("network.proxy.socks", "127.0.0.1"); pref("network.proxy.socks_port", 9150); pref("network.proxy.socks_remote_dns", true); pref("network.proxy.no_proxies_on", ""); // For fingerprinting and local service vulns (#10419) +pref("network.proxy.allow_hijacking_localhost", true); // Allow proxies for localhost (#31065) pref("network.proxy.type", 1); pref("network.security.ports.banned", "9050,9051,9150,9151"); pref("network.dns.disablePrefetch", true);

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 1560574 - use FormatPRExplodedTime to display GMT; r=kershaw
by gk＠torproject.org 03 Sep '19

03 Sep '19

commit a2e76dee549c9efb60bfa13c0e6e4e5f8b5edd76 Author: Liang-Heng Chen <xeonchen(a)gmail.com> Date: Tue Aug 20 14:00:31 2019 +0000 Bug 1560574 - use FormatPRExplodedTime to display GMT; r=kershaw Differential Revision: https://phabricator.services.mozilla.com/D36502 --HG-- extra : moz-landing-system : lando --- .../streamconv/converters/nsFTPDirListingConv.cpp | 2 +- netwerk/streamconv/converters/nsIndexedToHTML.cpp | 25 +++++++++++--- netwerk/test/unit/test_bug365133.js | 16 ++++----- netwerk/test/unit/test_bug484684.js | 40 +++++++++++----------- netwerk/test/unit/test_bug515583.js | 4 +-- netwerk/test/unit/test_bug543805.js | 24 ++++++------- 6 files changed, 64 insertions(+), 47 deletions(-) diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index af0093fd5c6c..b721016afd8f 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -294,7 +294,7 @@ char* nsFTPDirListingConv::DigestBufferLines(char* aBuffer, // the application/http-index-format specs // viewers of such a format can then reformat this into the // current locale (or anything else they choose) - PR_FormatTimeUSEnglish(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S", + PR_FormatTimeUSEnglish(buffer, sizeof(buffer), "%a, %d %b %Y %H:%M:%S GMT", &result.fe_time); nsAutoCString escaped; diff --git a/netwerk/streamconv/converters/nsIndexedToHTML.cpp b/netwerk/streamconv/converters/nsIndexedToHTML.cpp index cb8cf9c2f065..9ff8985cd48a 100644 --- a/netwerk/streamconv/converters/nsIndexedToHTML.cpp +++ b/netwerk/streamconv/converters/nsIndexedToHTML.cpp @@ -25,6 +25,7 @@ #include "nsDirIndexParser.h" #include "nsNativeCharsetUtils.h" #include "nsString.h" +#include "nsContentUtils.h" #include <algorithm> #include "nsIChannel.h" #include "mozilla/Unused.h" @@ -670,6 +671,24 @@ nsIndexedToHTML::OnDataAvailable(nsIRequest* aRequest, nsIInputStream* aInput, return mParser->OnDataAvailable(aRequest, aInput, aOffset, aCount); } +static nsresult FormatTime(const nsDateFormatSelector aDateFormatSelector, + const nsTimeFormatSelector aTimeFormatSelector, + const PRTime aPrTime, nsAString& aStringOut) { + // FormatPRExplodedTime will use GMT based formatted string (e.g. GMT+1) + // instead of local time zone name (e.g. CEST). + // To avoid this case when ResistFingerprinting is disabled, use + // |FormatPRTime| to show exact time zone name. + if (!nsContentUtils::ShouldResistFingerprinting()) { + return mozilla::DateTimeFormat::FormatPRTime( + aDateFormatSelector, aTimeFormatSelector, aPrTime, aStringOut); + } + + PRExplodedTime prExplodedTime; + PR_ExplodeTime(aPrTime, PR_GMTParameters, &prExplodedTime); + return mozilla::DateTimeFormat::FormatPRExplodedTime( + aDateFormatSelector, aTimeFormatSelector, &prExplodedTime, aStringOut); +} + NS_IMETHODIMP nsIndexedToHTML::OnIndexAvailable(nsIRequest* aRequest, nsISupports* aCtxt, nsIDirIndex* aIndex) { @@ -816,12 +835,10 @@ nsIndexedToHTML::OnIndexAvailable(nsIRequest* aRequest, nsISupports* aCtxt, pushBuffer.AppendInt(static_cast<int64_t>(t)); pushBuffer.AppendLiteral("\">"); nsAutoString formatted; - mozilla::DateTimeFormat::FormatPRTime(kDateFormatShort, kTimeFormatNone, t, - formatted); + FormatTime(kDateFormatShort, kTimeFormatNone, t, formatted); AppendNonAsciiToNCR(formatted, pushBuffer); pushBuffer.AppendLiteral("</td>\n <td>"); - mozilla::DateTimeFormat::FormatPRTime(kDateFormatNone, kTimeFormatSeconds, - t, formatted); + FormatTime(kDateFormatNone, kTimeFormatSeconds, t, formatted); // use NCR to show date in any doc charset AppendNonAsciiToNCR(formatted, pushBuffer); } diff --git a/netwerk/test/unit/test_bug365133.js b/netwerk/test/unit/test_bug365133.js index d9aabd5c6ea9..a872d7a5c7d9 100644 --- a/netwerk/test/unit/test_bug365133.js +++ b/netwerk/test/unit/test_bug365133.js @@ -8,7 +8,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "a%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 DIRECTORY \n', + '201: "a%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT DIRECTORY \n', ], [ /* Unix style listing, space at the end of link name */ @@ -17,7 +17,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "l%20" 2 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "l%20" 2 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* Unix style listing, regular file with " -> " in name */ @@ -26,7 +26,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "arrow%20-%3E%20in%20name%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "arrow%20-%3E%20in%20name%20" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], [ /* Unix style listing, tab at the end of filename */ @@ -35,7 +35,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "t%09" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 DIRECTORY \n', + '201: "t%09" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT DIRECTORY \n', ], [ /* Unix style listing, multiple " -> " in filename */ @@ -44,7 +44,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "symlink%20with%20arrow%20-%3E%20in%20name" 26 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "symlink%20with%20arrow%20-%3E%20in%20name" 26 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* Unix style listing, multiple " -> " in filename, incorrect filesize */ @@ -53,7 +53,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "symlink%20with%20arrow%20-%3E%20in%20name%20-%3E%20file%20with%20arrow" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 SYMBOLIC-LINK \n', + '201: "symlink%20with%20arrow%20-%3E%20in%20name%20-%3E%20file%20with%20arrow" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT SYMBOLIC-LINK \n', ], [ /* DOS style listing, space at the end of filename, year 1999 */ @@ -62,7 +62,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file%20" 1024 Fri%2C%2001%20Jan%201999%2001%3A00%3A00 FILE \n', + '201: "file%20" 1024 Fri%2C%2001%20Jan%201999%2001%3A00%3A00%20GMT FILE \n', ], [ /* DOS style listing, tab at the end of filename, year 2000 */ @@ -71,7 +71,7 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file%09" 1024 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "file%09" 1024 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], ]; diff --git a/netwerk/test/unit/test_bug484684.js b/netwerk/test/unit/test_bug484684.js index ae0d8276aaa4..e867d0c01637 100644 --- a/netwerk/test/unit/test_bug484684.js +++ b/netwerk/test/unit/test_bug484684.js @@ -10,8 +10,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "%20file2" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "%20file2" 0 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // old Hellsoft unix format [ @@ -22,8 +22,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "file2" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "file2" 214059 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // new Hellsoft unix format [ @@ -34,8 +34,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "file1" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n' + - '201: "%20file2" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00 FILE \n', + '201: "file1" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n' + + '201: "%20file2" 192 Sat%2C%2001%20Jan%202000%2000%3A00%3A00%20GMT FILE \n', ], // DOS format with correct offsets [ @@ -50,12 +50,12 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n' + - '201: "%20dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "%20junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "%20file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n' + + '201: "%20dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "%20junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "%20file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], // DOS format with wrong offsets [ @@ -72,14 +72,14 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "dir3" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 DIRECTORY \n' + - '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "junction3" Sat%2C%2001%20Jan%202000%2001%3A00%3A00 SYMBOLIC-LINK \n' + - '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n' + - '201: "file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00 FILE \n', + '201: "dir1" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "dir2" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "dir3" 0 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT DIRECTORY \n' + + '201: "junction1" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "junction2" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "junction3" Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT SYMBOLIC-LINK \n' + + '201: "file1" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n' + + '201: "file2" 95077 Sat%2C%2001%20Jan%202000%2001%3A00%3A00%20GMT FILE \n', ], ]; diff --git a/netwerk/test/unit/test_bug515583.js b/netwerk/test/unit/test_bug515583.js index 85db9fd8e9ef..fe958747e25c 100644 --- a/netwerk/test/unit/test_bug515583.js +++ b/netwerk/test/unit/test_bug515583.js @@ -14,8 +14,8 @@ const tests = [ URL + "\n" + "200: filename content-length last-modified file-type\n" + - '201: "A" 2048 Wed%2C%2003%20Mar%201993%2018%3A09%3A01 FILE \n' + - '201: "E" 2048 Mon%2C%2008%20Mar%201993%2018%3A09%3A01 FILE \n', + '201: "A" 2048 Wed%2C%2003%20Mar%201993%2018%3A09%3A01%20GMT FILE \n' + + '201: "E" 2048 Mon%2C%2008%20Mar%201993%2018%3A09%3A01%20GMT FILE \n', ], [ "\r\r\r\n", diff --git a/netwerk/test/unit/test_bug543805.js b/netwerk/test/unit/test_bug543805.js index f4dec7e099b4..8ea493982e01 100644 --- a/netwerk/test/unit/test_bug543805.js +++ b/netwerk/test/unit/test_bug543805.js @@ -22,24 +22,24 @@ const tests = [ day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "%20test.blankfile" 22 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n' + + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n' + '201: "nodup.file" 44 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "test.file" 55 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n', + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n', ], // standard ls format @@ -59,24 +59,24 @@ const tests = [ day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "%20test.blankfile" 22 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n' + + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "%20test2.blankfile" 33 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n' + '201: "nodup.file" 44 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + + "%2020%3A19%3A00%20GMT FILE \n" + '201: "test.file" 55 ' + day + "%2C%2001%20Jan%20" + year + - "%2020%3A19%3A00 FILE \n" + - '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00 FILE \n', + "%2020%3A19%3A00%20GMT FILE \n" + + '201: "test2.file" 66 Tue%2C%2001%20Apr%202008%2000%3A00%3A00%20GMT FILE \n', ], ];

1 0

[tor-browser-build/master] Pick up another fix for obfs4 compilation bustage
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 9fde9fe3b38b8785d08ea0d1fc291ac0c266ed04 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 21:12:39 2019 +0000 Pick up another fix for obfs4 compilation bustage --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 244421c..967eb08 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a6' - torbrowser_build: 'build3' + torbrowser_build: 'build4' torbrowser_incremental_from: - 9.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 8cb36805e3f408b9958d3bf75811d87cb54453e2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 21:11:30 2019 +0000 fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek. --- projects/goutls/config | 1 - projects/goxnet/config | 8 +------- projects/obfs4/build | 25 +++++++------------------ projects/obfs4/config | 2 -- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/projects/goutls/config b/projects/goutls/config index d738305..fa4b5d8 100644 --- a/projects/goutls/config +++ b/projects/goutls/config @@ -28,4 +28,3 @@ input_files: - name: gobsaes project: gobsaes - filename: sessionid.patch - enable: '[% c("var/nightly") || c("var/alpha") %]' diff --git a/projects/goxnet/config b/projects/goxnet/config index 6aa5a0e..ae574c6 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: 7dbad50ab5b31073856416cdcfeb2796d682f844 +git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -13,12 +13,6 @@ var: go_lib_install: - golang.org/x/net/proxy -targets: - nightly: - # Nightly version of obfs4 requires a more recent version of goxnet - # See bug 29193 - git_hash: ed066c81e75eba56dd9bd2139ade88125b855585 - input_files: - project: container-image - name: go diff --git a/projects/obfs4/build b/projects/obfs4/build index 3f650c4..33b0add 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -11,29 +11,18 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -[% IF c("var/nightly") || c("var/alpha") -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] -[% END -%] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/nightly") || c("var/alpha") -%] - # Remove go.mod and go.sum files until we can build using Go module - # versioning (see bug 28325). - rm -f go.mod go.sum -[% END -%] -# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4 -# upstream repo to gitlab.com/yawning/obfs4.git. -[% IF c("var/nightly") || c("var/alpha") %] - mkdir -p "$GOPATH/src/gitlab.com/yawning" - ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" -[% ELSE %] - mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" - ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git" -[% END %] +# Remove go.mod and go.sum files until we can build using Go module +# versioning (see bug 28325). +rm -f go.mod go.sum +mkdir -p "$GOPATH/src/gitlab.com/yawning" +ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git" cd obfs4proxy go build -ldflags '-s' cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR diff --git a/projects/obfs4/config b/projects/obfs4/config index ce57cdc..d9357bb 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -34,7 +34,5 @@ input_files: project: goxnet - name: goutls project: goutls - enable: '[% c("var/nightly") || c("var/alpha") %]' - name: goxtext project: goxtext - enable: '[% c("var/nightly") || c("var/alpha") %]'

1 0

[tor-browser-build/master] Pick up fix for obfs4 compilation bustage
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 708993137e2cea1cdc979722a76c3eedd3f6cfd5 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 20:32:50 2019 +0000 Pick up fix for obfs4 compilation bustage --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index c16e8ae..244421c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a6' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0a4 project_name: tor-browser

1 0

[tor-browser-build/master] fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek.
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 86021a7ad8c95feaf26247ff33481be3bb863fcc Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 20:31:25 2019 +0000 fixup! Bug 29430: Use obfs4proxy's meek_lite with utls instead of meek. --- projects/obfs4/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/obfs4/config b/projects/obfs4/config index 48afc2f..ce57cdc 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -34,7 +34,7 @@ input_files: project: goxnet - name: goutls project: goutls - enable: '[% c("var/nightly") %]' + enable: '[% c("var/nightly") || c("var/alpha") %]' - name: goxtext project: goxtext - enable: '[% c("var/nightly") %]' + enable: '[% c("var/nightly") || c("var/alpha") %]'

1 0

[tor-browser-build/master] Pick up fix for #31592
by gk＠torproject.org 02 Sep '19

02 Sep '19

commit 4e2920301010a8c6f127828a40321aa81b28820c Author: Georg Koppen <gk(a)torproject.org> Date: Mon Sep 2 15:47:45 2019 +0000 Pick up fix for #31592 --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index 6bdcf8d..b13635c 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") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1

1 0