commit d0f2bcf4697fe06cb034e412bd6d262ac12d3a3e Merge: 826d27b 055e751 Author: Georg Koppen gk@torproject.org Date: Wed Dec 6 08:55:46 2017 +0000
Merge remote-tracking branch 'boklm/bug_21998_v4'
Makefile | 12 ++++++++++++ README.MAKEFILE | 4 ++++ projects/firefox/build | 6 ++++++ projects/release/config | 6 +++++- projects/tor-browser/RelativeLink/start-tor-browser | 7 +++++++ projects/tor-browser/build | 4 ++++ projects/tor-browser/config | 4 +++- projects/tor/build | 1 + rbm.conf | 7 +++++++ 9 files changed, 49 insertions(+), 2 deletions(-)
diff --cc projects/tor-browser/config index 9aff47d,42f77e4..d2085b0 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@@ -66,10 -66,12 +66,12 @@@ input_files name: snowflake enable: '[% c("var/snowflake") %]' - filename: Bundle-Data - - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite... + - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite... name: noscript - sha256sum: 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b + sha256sum: 8ff67073e9757c73366c376884165eb157581c81871e89fc89c3ee0d2e2943b2 - - filename: RelativeLink + - filename: 'RelativeLink/start-tor-browser.desktop' + enable: '[% c("var/linux") %]' + - filename: 'RelativeLink/execdesktop' enable: '[% c("var/linux") %]' - project: libdmg-hfsplus name: libdmg