commit c7e16bb784a74733549cbcbcedb87b85c550cb9b Author: Matthew Finkel <sysrqb@torproject.org> Date: Wed Jun 30 17:54:15 2021 +0000 Revert "fixup! Add Tor Project bookmarks: tb-manual, community portal, donation, bridges db, and support portal" This reverts commit 215c74866903946fa75fe369108562506fcfe5ba. --- projects/tor-browser/build | 11 +++++++++-- projects/tor-browser/config | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index d2b8482..1d2e35b 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -48,7 +48,9 @@ MARTOOLS=$rootdir/mar-tools mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %] -tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] +[% IF c("var/snowflake") %] + tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%] +[% END -%] tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %] @@ -133,7 +135,12 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH" tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults" -cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" +[% IF ! c("var/snowflake") %] + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ + >> "$GENERATEDPREFSPATH" +[% ELSE %] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" +[% END %] [% IF ! c("var/multi_lingual") %] echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 1045d90..f98062e 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -75,7 +75,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% ! c("var/android") %]' + enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite...