- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 33283: Pick up RBM caching logic
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit ffc6f844dbbf1985f5d10bd8dab2b15d9c8c2e75 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 19 17:50:41 2020 +0000 Bug 33283: Pick up RBM caching logic --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index 94fce31..e4f12ab 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit 94fce31e54d3fd491cdb3e3b9401919c0e841360 +Subproject commit e4f12abe9ed81050994b5345c21b988005259396

1 0

[rbm/master] Bug 33283: Add caching for the exec template function
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit ce6b9136fc9e006536b34844946d67aa92cc0c21 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 12 11:16:22 2020 +0100 Bug 33283: Add caching for the exec template function --- lib/RBM.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index 4db951a..f419c24 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -475,10 +475,14 @@ sub run_script { sub execute { my ($project, $cmd, $options) = @_; + CORE::state %cache; + my $res_name; my $old_cwd = getcwd; if (project_config($project, 'git_url', $options)) { my $git_hash = project_config($project, 'git_hash', $options) || exit_error "No git_hash specified for project $project"; + $res_name = "git-$git_hash-$cmd"; + return $cache{$res_name} if exists $cache{$res_name}; git_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) = capture_exec('git', 'checkout', $git_hash); @@ -494,6 +498,8 @@ sub execute { } elsif (project_config($project, 'hg_url', $options)) { my $hg_hash = project_config($project, 'hg_hash', $options) || exit_error "No hg_hash specified for project $project"; + $res_name = "hg-$hg_hash-$cmd"; + return $cache{$res_name} if exists $cache{$res_name}; hg_clone_fetch_chdir($project, $options); my ($stdout, $stderr, $success, $exit_code) = capture_exec('hg', 'update', '-C', $hg_hash); @@ -503,7 +509,8 @@ sub execute { = run_script($project, $cmd, \&capture_exec); chdir($old_cwd); chomp $stdout; - return $success ? $stdout : undef; + $cache{$res_name} = $success ? $stdout : undef; + return $cache{$res_name}; } sub gpg_id {

1 0

[rbm/master] Bug 33283: Avoid computing sha256sum of files multiple times
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit e4f12abe9ed81050994b5345c21b988005259396 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 12 16:09:00 2020 +0100 Bug 33283: Avoid computing sha256sum of files multiple times Instead, use the sha256file functon, which keeps the sha256sum of files to avoid computing it twice. The function can now take a HASH as a second argument, which can contain the key remove_cache indicating that the sha256sum of a file should be cleared: we use this when we find that a file has the wrong checksum and needs to be downloaded again. --- lib/RBM.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/RBM.pm b/lib/RBM.pm index f419c24..375648f 100644 --- a/lib/RBM.pm +++ b/lib/RBM.pm @@ -610,6 +610,11 @@ sub maketar { sub sha256file { CORE::state %res; my $f = rbm_path(shift); + my $opt = shift; + if (ref $opt eq 'HASH' && $opt->{remove_cache}) { + delete $res{$f}; + return; + } return $res{$f} if exists $res{$f}; return $res{$f} = -f $f ? sha256_hex(path($f)->slurp_raw) : ''; } @@ -724,7 +729,8 @@ sub input_file_need_dl { return undef if $action eq 'getfpaths'; if ($fname && $input_file->{sha256sum} - && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { + && $t->('sha256sum') ne sha256file($fname)) { + sha256file($fname, { remove_cache => 1 }); $fname = undef; } if ($action eq 'input_files_id') { @@ -928,7 +934,7 @@ sub input_files { } exit_error "Missing file $name" unless $fname; if ($t->('sha256sum') - && $t->('sha256sum') ne sha256_hex(path($fname)->slurp_raw)) { + && $t->('sha256sum') ne sha256file($fname)) { exit_error "Can't have sha256sum on directory: $fname" if -d $fname; exit_error "Wrong sha256sum for $fname.\n" . "Expected sha256sum: " . $t->('sha256sum');

1 0

[tor-browser-build/master] Bug 33380: Add *.json to sha256sums-unsigned-build.txt
by sysrqb＠torproject.org 19 Feb '20

19 Feb '20

commit 19497b09ae5f68768a1d2690249b51b6fca89b41 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Feb 19 12:51:44 2020 +0100 Bug 33380: Add *.json to sha256sums-unsigned-build.txt --- projects/release/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/build b/projects/release/build index c1badd6..c859828 100644 --- a/projects/release/build +++ b/projects/release/build @@ -46,7 +46,7 @@ RewriteRule ^sha256sums.txt.asc$ sha256sums-unsigned-build.txt.asc RewriteRule ^sha256sums.incrementals.txt$ sha256sums-unsigned-build.incrementals.txt RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incrementals.txt.asc EOF -sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt [% IF c("var/sign_build") -%] gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt [% END -%]

1 0

[tor-browser-build/master] Small typos in 9.5a5 changelog
by sysrqb＠torproject.org 14 Feb '20

14 Feb '20

commit 0e2585be3ab2a4dc5b533c87d8745b0bf4a75bc4 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 14 16:28:35 2020 +0000 Small typos in 9.5a5 changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 16acbbf..72bb219 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -14,11 +14,11 @@ Tor Browser 9.5a5 -- February 12 2020 * Android * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android * Windows + OS X + Linux - * Update Tor to 0.4.3.1-alpha + * Update Tor to 0.4.3.2-alpha * Update Tor Launcher to 0.2.21.1 * Translations update * Bug 30237: Add v3 onion services client authentication prompt - * Bug 32870: Update version of pion-webrtc + * Bug 32870: Update version of pion-webrtc * Bug 32767: Remove Disconnect search * Bug 30237: Add v3 onion services client authentication prompt * Build System

1 0

[tor-browser-build/master] Pick up tor-browser -build2
by sysrqb＠torproject.org 12 Feb '20

12 Feb '20

commit c27a4f73c2a221baddc4d68c63f21adce595fb12 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Feb 12 01:51:27 2020 +0000 Pick up tor-browser -build2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 845f9c6..d9b9edb 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-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 32b0575..32da3c6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a5' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a4 project_name: tor-browser

1 0

[tor-browser/tor-browser-68.5.0esr-9.5-1] Revert "Bug 1603270 - Add telemetry for FirefoxPromoBannerRow user actions. r=VladBaicu, a=RyanVM"
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit c2da27fca068dac7658fe53f51124908ee8c723b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Tue Feb 11 20:41:06 2020 +0000 Revert "Bug 1603270 - Add telemetry for FirefoxPromoBannerRow user actions. r=VladBaicu, a=RyanVM" This reverts commit 334f572f8b2113c464bd65e1282b7085a1dfb5eb. --- mobile/android/base/java/org/mozilla/gecko/Telemetry.java | 9 --------- mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java | 2 -- 2 files changed, 11 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/Telemetry.java b/mobile/android/base/java/org/mozilla/gecko/Telemetry.java index 4da174d18bb9..20a50a0bd34b 100644 --- a/mobile/android/base/java/org/mozilla/gecko/Telemetry.java +++ b/mobile/android/base/java/org/mozilla/gecko/Telemetry.java @@ -5,7 +5,6 @@ package org.mozilla.gecko; -import org.mozilla.gecko.activitystream.homepanel.stream.FirefoxPromoBannerRow; import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.TelemetryContract.Event; @@ -16,10 +15,8 @@ import org.mozilla.gecko.mma.MmaDelegate; import android.util.Log; -import static org.mozilla.gecko.mma.MmaDelegate.DISMISSED_FIREFOX_PROMO_BANNER; import static org.mozilla.gecko.mma.MmaDelegate.INTERACT_WITH_SEARCH_URL_AREA; import static org.mozilla.gecko.mma.MmaDelegate.OPENED_BOOKMARK; -import static org.mozilla.gecko.mma.MmaDelegate.OPENED_FIREFOX_PROMO_BANNER; import static org.mozilla.gecko.mma.MmaDelegate.SAVED_BOOKMARK; import static org.mozilla.gecko.mma.MmaDelegate.SAVED_LOGIN_AND_PASSWORD; import static org.mozilla.gecko.mma.MmaDelegate.SCREENSHOT; @@ -111,12 +108,6 @@ public class Telemetry { MmaDelegate.track(SAVED_LOGIN_AND_PASSWORD); } else if (eventName.equalsIgnoreCase(Event.ACTION.toString()) && method == Method.BUTTON && extras.equals("awesomescreen-signup-dismiss")) { MmaDelegate.track(SIGN_UP_DISMISS); - } else if (eventName.equalsIgnoreCase(Event.ACTION.toString()) && method == Method.BUTTON && - extras.equals(FirefoxPromoBannerRow.FIREFOX_PROMO_OPEN_EVENT)) { - MmaDelegate.track(OPENED_FIREFOX_PROMO_BANNER); - } else if (eventName.equalsIgnoreCase(Event.ACTION.toString()) && method == Method.BUTTON && - extras.equals(FirefoxPromoBannerRow.FIREFOX_PROMO_DISMISS_EVENT)) { - MmaDelegate.track(DISMISSED_FIREFOX_PROMO_BANNER); } } } diff --git a/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java b/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java index f4a3e926afc3..68a36a65026c 100644 --- a/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java +++ b/mobile/android/base/java/org/mozilla/gecko/mma/MmaDelegate.java @@ -55,8 +55,6 @@ public class MmaDelegate { public static final String ONBOARDING_DEFAULT_VALUES = "E_Onboarding_With_Default_Values"; public static final String ONBOARDING_REMOTE_VALUES = "E_Onboarding_With_Remote_Values"; public static final String SIGN_UP_DISMISS = "E_Signup_Dismiss"; - public static final String OPENED_FIREFOX_PROMO_BANNER = "E_Opened_Firefox_Promo"; - public static final String DISMISSED_FIREFOX_PROMO_BANNER = "E_Dismissed_Firefox_Promo"; public static final String USER_SIGNED_IN_TO_FXA = "E_User_Signed_In_To_FxA"; public static final String USER_SIGNED_UP_FOR_FXA = "E_User_Signed_Up_For_FxA";

1 0

[tor-browser-build/master] Bug 30767: Support custom PT bridges on Android
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit 3ce57ded27baa63dfff074e9a10a62365dc3bc25 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri Feb 7 02:18:21 2020 +0000 Bug 30767: Support custom PT bridges on Android --- ...ustom-obfs4-bridge-does-not-work-on-Tor-B.patch | 146 +++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 3 files changed, 148 insertions(+) diff --git a/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch new file mode 100644 index 0000000..2d1bc51 --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch @@ -0,0 +1,146 @@ +From 0a482a749fd770827d3d6c71debb112a07e7fae3 Mon Sep 17 00:00:00 2001 +From: sisbell <shane.isbell(a)gmail.com> +Date: Thu, 14 Nov 2019 13:43:09 -0800 +Subject: [PATCH] Bug 30767: Custom obfs4 bridge does not work on Tor Browser + for Android + +TOPL fixes #134 +--- + .../thali/toronionproxy/TorConfigBuilder.java | 63 ++++++++----------- + 1 file changed, 26 insertions(+), 37 deletions(-) + +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index e324d9f..da9a6a2 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -99,25 +99,32 @@ public final class TorConfigBuilder { + return this; + } + ++ @SettingsConfig ++ public TorConfigBuilder bridgesFromSettings() { ++ try { ++ addBridgesFromResources(); ++ } catch (IOException e) { ++ e.printStackTrace(); ++ } ++ return this; ++ } ++ + public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { +- List<String> supportedBridges = settings.getListOfSupportedBridges(); +- if (pluggableTransportClient == null || !settings.hasBridges() || supportedBridges.size() < 1) { ++ if (pluggableTransportClient == null) { + return this; + } + +- if (!pluggableTransportClient.exists() || !pluggableTransportClient.canExecute()) { ++ if (!pluggableTransportClient.exists()) { + throw new IOException("Bridge binary does not exist: " + pluggableTransportClient + .getCanonicalPath()); + } + +- if (supportedBridges.contains("obfs3") || supportedBridges.contains("obfs4")) { +- transportPluginObfs(pluggableTransportClient.getCanonicalPath()); +- } +- if (supportedBridges.contains("meek")) { +- transportPluginMeek(pluggableTransportClient.getCanonicalPath()); ++ if (!pluggableTransportClient.canExecute()) { ++ throw new IOException("Bridge binary is not executable: " + pluggableTransportClient ++ .getCanonicalPath()); + } +- String type = supportedBridges.contains("meek") ? "meek_lite" : "obfs4"; +- addBridgesFromResources(type, 2); ++ ++ transportPlugin(pluggableTransportClient.getCanonicalPath()); + return this; + } + +@@ -471,14 +478,8 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPluginMeek(String clientPath) { +- buffer.append("ClientTransportPlugin meek_lite exec ").append(clientPath).append('\n'); +- return this; +- } +- +- public TorConfigBuilder transportPluginObfs(String clientPath) { +- buffer.append("ClientTransportPlugin obfs3 exec ").append(clientPath).append('\n'); +- buffer.append("ClientTransportPlugin obfs4 exec ").append(clientPath).append('\n'); ++ public TorConfigBuilder transportPlugin(String clientPath) { ++ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); + return this; + } + +@@ -489,7 +490,7 @@ public final class TorConfigBuilder { + + @SettingsConfig + public TorConfigBuilder useBridgesFromSettings() { +- return !settings.hasBridges() ? dontUseBridges() : this; ++ return settings.hasBridges() ? useBridges() : this; + } + + public TorConfigBuilder virtualAddressNetwork(String address) { +@@ -518,12 +519,12 @@ public final class TorConfigBuilder { + * </code> + * + */ +- TorConfigBuilder addBridgesFromResources(String type, int maxBridges) throws IOException { ++ TorConfigBuilder addBridgesFromResources() throws IOException { + if(settings.hasBridges()) { + InputStream bridgesStream = context.getInstaller().openBridgesStream(); + int formatType = bridgesStream.read(); +- if(formatType == 0) { +- addBridges(bridgesStream, type, maxBridges); ++ if (formatType == 0) { ++ addBridges(bridgesStream); + } else { + addCustomBridges(bridgesStream); + } +@@ -534,23 +535,14 @@ public final class TorConfigBuilder { + /** + * Add bridges from bridges.txt file. + */ +- private void addBridges(InputStream input, String bridgeType, int maxBridges) { +- if (input == null || isNullOrEmpty(bridgeType) || maxBridges < 1) { ++ private void addBridges(InputStream input) { ++ if (input == null) { + return; + } +- boolean hasAddedBridge = false; + List<Bridge> bridges = readBridgesFromStream(input); +- Collections.shuffle(bridges, new Random(System.nanoTime())); +- int bridgeCount = 0; + for (Bridge b : bridges) { +- if (b.type.equals(bridgeType)) { +- bridge(b.type, b.config); +- hasAddedBridge = true; +- if (++bridgeCount > maxBridges) +- break; +- } ++ bridge(b.type, b.config); + } +- if(hasAddedBridge) useBridges(); + } + + /** +@@ -560,15 +552,12 @@ public final class TorConfigBuilder { + if (input == null) { + return; + } +- boolean hasAddedBridge = false; + List<Bridge> bridges = readCustomBridgesFromStream(input); + for (Bridge b : bridges) { + if (b.type.equals("custom")) { + bridgeCustom(b.config); +- hasAddedBridge = true; + } + } +- if(hasAddedBridge) useBridges(); + } + + private static List<Bridge> readBridgesFromStream(InputStream input) { +-- +2.20.1 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index 0f2d976..9a8b31e 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -21,6 +21,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # build will pull down the correct android tool versions patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/canceldormant.patch +patch -p1 < $rootdir/0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index ff3432c..d76949d 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -32,3 +32,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: canceldormant.patch + - filename: 0001-Bug-30767-Custom-obfs4-bridge-does-not-work-on-Tor-B.patch

1 0

[tor-browser-build/master] Bug 33200: Fix permissions on bookmarks.html
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit 241e805dbbefcb0860bf32a38b63fcd7edf71a68 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Feb 9 23:50:01 2020 +0100 Bug 33200: Fix permissions on bookmarks.html Fix a build reproducibility issue caused by different permissions on bookmarks.html. --- projects/tor-browser/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 2633ddc..b9732e8 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -170,6 +170,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir mkdir -p chrome/en-US/locale/browser cp -p $rootdir/bookmarks.html chrome/en-US/locale/browser/ [% c("var/touch") %] chrome/en-US/locale/browser/bookmarks.html + chmod 600 chrome/en-US/locale/browser/bookmarks.html zip -Xm omni.ja chrome/en-US/locale/browser/bookmarks.html rm -rf chrome [% END %]

1 0

[tor-browser-build/master] Release preparations for 9.5a5
by sysrqb＠torproject.org 11 Feb '20

11 Feb '20

commit d3059ceb6288874b682076a5bf4aa1dff76511cd Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Feb 10 01:16:23 2020 +0000 Release preparations for 9.5a5 Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 29 ++++++++++++++++++++++ projects/tor-browser/config | 4 +-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 ++--- 8 files changed, 39 insertions(+), 10 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 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: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2f4997f..2ea6db6 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 diff --git a/projects/firefox/config b/projects/firefox/config index f780084..845f9c6 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.4.1 + firefox_platform_version: 68.5.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 9.5 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ad3cc9d..16acbbf 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,32 @@ +Tor Browser 9.5a5 -- February 12 2020 + * All Platforms + * Update Firefox to 68.5.0esr + * Bump NoScript to 11.0.13 + * Translations update + * Bug 30237: Control port module improvements for v3 client authentication + * Bug 32891: Add new default bridges + * Bug 31395: Remove inline script in aboutTor.xhtml + * Bug 27268: Preferences clean-up in Torbutton code + * Bug 32470: Backport fix for bug 1590538 + * Bug 32414: Make Services.search.addEngine obey FPI + * Bug 32948: Make referer behavior consistent regardless of private browing mode status + * Bug 461204: Improve the random number generator for the boundaries in multipart/form-data + * Android + * Bug 30767: Custom obfs4 bridge does not work on Tor Browser for Android + * Windows + OS X + Linux + * Update Tor to 0.4.3.1-alpha + * Update Tor Launcher to 0.2.21.1 + * Translations update + * Bug 30237: Add v3 onion services client authentication prompt + * Bug 32870: Update version of pion-webrtc + * Bug 32767: Remove Disconnect search + * Bug 30237: Add v3 onion services client authentication prompt + * Build System + * Linux + * Bug 32976: Build and bundle geckodriver + * OS X + * Bug 33200: Fix permissions on bookmarks.html + Tor Browser 9.5a4 -- January 10 2020 * All Platforms * Update Firefox to 68.4.1esr diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d3e8e61..7fd61a9 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -74,9 +74,9 @@ input_files: enable: '[% c("var/snowflake") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… name: noscript - sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5 + sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 874ad15..fec0612 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21 +version: 0.2.21.1 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index c1c41a6..9b5ba3d 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.4.3.1-alpha +version: 0.4.3.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 77c6e4a..32b0575 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a4' - torbrowser_build: 'build2' + torbrowser_version: '9.5a5' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a3 + - 9.5a4 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0