June 2018 - tor-commits - lists.torproject.org

[tor/master] Eliminate compat.h
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 6ac64e16ed6958d1a5960c560254217478b7ad87 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 11:42:52 2018 -0400 Eliminate compat.h --- src/common/include.am | 1 - src/or/config.c | 1 - src/or/directory.c | 1 - src/or/keypin.c | 1 - src/or/protover.h | 3 +++ src/or/torcert.c | 1 - src/test/test-memwipe.c | 1 - src/test/test-timers.c | 1 - src/test/test.h | 1 - src/test/test_crypto_openssl.c | 1 - src/test/test_hs_ntor_cl.c | 1 - src/test/test_link_handshake.c | 3 --- src/test/test_ntor_cl.c | 1 - src/test/test_tortls.c | 3 +-- 14 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 899e76364..7427c6944 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -50,7 +50,6 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) COMMONHEADERS = \ src/common/address_set.h \ - src/common/compat.h \ src/common/compat_libevent.h \ src/common/handles.h \ src/common/procmon.h \ diff --git a/src/or/config.c b/src/or/config.c index 458b6bae2..e3a4faa31 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -62,7 +62,6 @@ #define CONFIG_PRIVATE #include "or/or.h" #include "or/bridges.h" -#include "common/compat.h" #include "or/addressmap.h" #include "or/channel.h" #include "or/circuitbuild.h" diff --git a/src/or/directory.c b/src/or/directory.c index 4e34af305..763666d2f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -17,7 +17,6 @@ #include "or/consdiff.h" #include "or/consdiffmgr.h" #include "or/control.h" -#include "common/compat.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" #include "or/directory.h" diff --git a/src/or/keypin.c b/src/or/keypin.c index 8100f3b73..34cf64f5c 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -11,7 +11,6 @@ #define KEYPIN_PRIVATE #include "orconfig.h" -#include "common/compat.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_format.h" #include "lib/ctime/di_ops.h" diff --git a/src/or/protover.h b/src/or/protover.h index aab311e96..7319d2f8c 100644 --- a/src/or/protover.h +++ b/src/or/protover.h @@ -9,6 +9,9 @@ #ifndef TOR_PROTOVER_H #define TOR_PROTOVER_H +#include <stdbool.h> +#include "lib/cc/torint.h" +#include "lib/testsupport/testsupport.h" struct smartlist_t; /** The first version of Tor that included "proto" entries in its diff --git a/src/or/torcert.c b/src/or/torcert.c index e307dd1b5..785132c17 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -32,7 +32,6 @@ #include "trunnel/ed25519_cert.h" #include "lib/log/torlog.h" #include "common/util.h" -#include "common/compat.h" #include "trunnel/link_handshake.h" #include "or/or_handshake_certs_st.h" diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 16bb017c8..552cbbc55 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -8,7 +8,6 @@ #include <stdlib.h> #include "lib/crypt_ops/crypto_util.h" -#include "common/compat.h" #include "common/util.h" static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); diff --git a/src/test/test-timers.c b/src/test/test-timers.c index 70f07fba4..f6ff9a5f8 100644 --- a/src/test/test-timers.c +++ b/src/test/test-timers.c @@ -7,7 +7,6 @@ #include <stdio.h> #include <string.h> -#include "common/compat.h" #include "common/compat_libevent.h" #include "lib/crypt_ops/crypto_rand.h" #include "common/timers.h" diff --git a/src/test/test.h b/src/test/test.h index 9abd46008..c231bc5f8 100644 --- a/src/test/test.h +++ b/src/test/test.h @@ -13,7 +13,6 @@ #define DEBUG_SMARTLIST 1 -#include "common/compat.h" #include "tinytest.h" #define TT_EXIT_TEST_FUNCTION STMT_BEGIN goto done; STMT_END #include "tinytest_macros.h" diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c index a01de18a6..d443ba6fd 100644 --- a/src/test/test_crypto_openssl.c +++ b/src/test/test_crypto_openssl.c @@ -10,7 +10,6 @@ #include "lib/crypt_ops/crypto_rand.h" #include "common/util.h" #include "lib/encoding/binascii.h" -#include "common/compat.h" #include "test/test.h" #include <openssl/evp.h> diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c index 9b59f0ddb..5475f3b38 100644 --- a/src/test/test_hs_ntor_cl.c +++ b/src/test/test_hs_ntor_cl.c @@ -15,7 +15,6 @@ #define ONION_NTOR_PRIVATE #include "or/or.h" #include "common/util.h" -#include "common/compat.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "or/hs_ntor.h" diff --git a/src/test/test_link_handshake.c b/src/test/test_link_handshake.c index 2650caf95..ffb6c47b1 100644 --- a/src/test/test_link_handshake.c +++ b/src/test/test_link_handshake.c @@ -8,8 +8,6 @@ #define TOR_CHANNEL_INTERNAL_ #define TORTLS_PRIVATE -#include "common/compat.h" - #include "or/or.h" #include "or/config.h" #include "or/connection.h" @@ -1581,4 +1579,3 @@ struct testcase_t link_handshake_tests[] = { END_OF_TESTCASES }; - diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index a10cd7e9b..75d5ccc12 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -8,7 +8,6 @@ #define ONION_NTOR_PRIVATE #include "or/or.h" #include "common/util.h" -#include "common/compat.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "or/onion_ntor.h" diff --git a/src/test/test_tortls.c b/src/test/test_tortls.c index f1b9b99f5..b45673468 100644 --- a/src/test/test_tortls.c +++ b/src/test/test_tortls.c @@ -11,7 +11,7 @@ #endif #include <math.h> -#include "common/compat.h" +#include "lib/cc/compat_compiler.h" /* Some versions of OpenSSL declare SSL_get_selected_srtp_profile twice in * srtp.h. Suppress the GCC warning so we can build with -Wredundant-decl. */ @@ -2839,4 +2839,3 @@ struct testcase_t tortls_tests[] = { LOCAL_TEST_CASE(context_init_one, 0), END_OF_TESTCASES }; -

1 0

[tor/master] Add a missing include to timers, to make windows happier
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit 9d5b815dcabc7344f4e0613246d061064f6d1bd1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 29 12:59:43 2018 -0400 Add a missing include to timers, to make windows happier --- src/common/timers.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/timers.c b/src/common/timers.c index 57b7d7265..ff92a2e44 100644 --- a/src/common/timers.c +++ b/src/common/timers.c @@ -39,6 +39,11 @@ #include "lib/malloc/util_malloc.h" #include "lib/time/compat_time.h" +#ifdef _WIN32 +// For struct timeval. +#include <winsock2.h> +#endif + struct timeout_cb { timer_cb_fn_t cb; void *arg;

1 0

[tor/master] Fix macOS includes
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit f9e22c68a0c701745867a9dac391a70171654c75 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Jun 28 17:15:53 2018 -0500 Fix macOS includes Recent code movement from refactoring missed some includes that seem to be necessary on macOS. --- src/common/compat.c | 3 --- src/lib/process/env.c | 4 ++++ src/lib/string/compat_string.c | 1 + src/lib/time/compat_time.c | 1 + src/lib/time/tvdiff.c | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 6d89e1c08..63bf99de6 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -60,9 +60,6 @@ #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif -#ifdef HAVE_CRT_EXTERNS_H -#include <crt_externs.h> -#endif #ifdef HAVE_SYS_STATVFS_H #include <sys/statvfs.h> #endif diff --git a/src/lib/process/env.c b/src/lib/process/env.c index 95e1e515d..731f609ac 100644 --- a/src/lib/process/env.c +++ b/src/lib/process/env.c @@ -18,6 +18,10 @@ #endif #include <stdlib.h> #include <string.h> +#ifdef HAVE_CRT_EXTERNS_H +/* For _NSGetEnviron on macOS */ +#include <crt_externs.h> +#endif #ifndef HAVE__NSGETENVIRON #ifndef HAVE_EXTERN_ENVIRON_DECLARED diff --git a/src/lib/string/compat_string.c b/src/lib/string/compat_string.c index 3f8a4d515..8b063b724 100644 --- a/src/lib/string/compat_string.c +++ b/src/lib/string/compat_string.c @@ -15,6 +15,7 @@ #endif #include <stdlib.h> +#include <string.h> /** Helper for tor_strtok_r_impl: Advances cp past all characters in * <b>sep</b>, and returns its new value. */ diff --git a/src/lib/time/compat_time.c b/src/lib/time/compat_time.c index 08f99b70c..2ea6eca98 100644 --- a/src/lib/time/compat_time.c +++ b/src/lib/time/compat_time.c @@ -16,6 +16,7 @@ #include "lib/log/torlog.h" #include "lib/log/util_bug.h" #include "lib/intmath/muldiv.h" +#include "lib/intmath/bits.h" #include "lib/fs/winlib.h" #include "lib/wallclock/timeval.h" diff --git a/src/lib/time/tvdiff.c b/src/lib/time/tvdiff.c index 9fb67bcd2..5dbc0fd19 100644 --- a/src/lib/time/tvdiff.c +++ b/src/lib/time/tvdiff.c @@ -11,6 +11,9 @@ #ifdef _WIN32 #include <winsock2.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif #define TOR_USEC_PER_SEC 1000000

1 0

[tor/master] Merge remote-tracking branch 'catalyst-github/fix-macos-includes'
by nickm＠torproject.org 29 Jun '18

29 Jun '18

commit f0319fcbde2117098bcef12cc731600fd6a85afe Merge: 365179cd1 f9e22c68a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 28 18:19:53 2018 -0400 Merge remote-tracking branch 'catalyst-github/fix-macos-includes' src/common/compat.c | 3 --- src/lib/process/env.c | 4 ++++ src/lib/string/compat_string.c | 1 + src/lib/time/compat_time.c | 1 + src/lib/time/tvdiff.c | 3 +++ 5 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor-browser-build/master] Bug 26039: FIXUP <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 8cfb90c7f21a220378adaaa8f5f54ce0e9cccb39 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 26 11:06:57 2018 -0700 Bug 26039: FIXUP <profiledir>/preferences/extension-overrides.js will not be loaded in ESR 60 Fixup for 26039. WebExtension extensions can't read/write prefs, so the base contents of extension-overrides.js are completely unnecessary. The WebExtension versions of noscript and httpseverywhere seem to be nearly complete re-writes (noscript in particular is much simpler) so our custom options appear to be no longer required (though a complete audit of noscript should probably be done just to be sure we don't need to fix any bad behaviour). The updated build script for tor-browser now dumps all of the build-determined prefs (pluggable transport strings, localization options) into a generated-prefs.js file created at build time, which is then appended to 000-tor-browser.js as before. The pdfjs option is no longer needed since the disableRange option seems to break pdfjs altogether in latest ESR60. Also, setting the user pref in 000-tor-browser.js does not work since pdfjs overwrites it with its own value (any future patch setting pdfjs options needs to modify the default values table) --- .../Bundle-Data/PTConfigs/extension-overrides.js | 63 ---------------------- projects/tor-browser/build | 16 +++--- 2 files changed, 9 insertions(+), 70 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js b/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js deleted file mode 100644 index c81a7bf..0000000 --- a/projects/tor-browser/Bundle-Data/PTConfigs/extension-overrides.js +++ /dev/null @@ -1,63 +0,0 @@ -# Overrides for Extension Preferences -# Tor Browser Bundle -# Do not edit this file. - -# HTTPS Everywhere Preferences: -pref("extensions.https_everywhere._observatory.popup_shown", true); -pref("extensions.https_everywhere.toolbar_hint_shown", true); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache"); -pref("noscript.ABE.enabled", false); -pref("noscript.ABE.notify", false); -pref("noscript.ABE.wanIpAsLocal", false); -pref("noscript.confirmUnblock", false); -pref("noscript.contentBlocker", true); -pref("noscript.firstRunRedirection", false); -pref("noscript.global", true); -pref("noscript.gtemp", ""); -pref("noscript.opacizeObject", 3); -pref("noscript.forbidWebGL", true); -pref("noscript.forbidFonts", false); -pref("noscript.options.tabSelectedIndexes", "5,0,0"); -pref("noscript.policynames", ""); -pref("noscript.secureCookies", true); -pref("noscript.showAllowPage", false); -pref("noscript.showBaseDomain", false); -pref("noscript.showDistrust", false); -pref("noscript.showRecentlyBlocked", false); -pref("noscript.showTemp", false); -pref("noscript.showTempToPerm", false); -pref("noscript.showUntrusted", false); -pref("noscript.STS.enabled", false); -pref("noscript.subscription.lastCheck", -142148139); -pref("noscript.temp", ""); -pref("noscript.untrusted", ""); -pref("noscript.forbidMedia", false); -pref("noscript.allowWhitelistUpdates", false); -pref("noscript.fixLinks", false); -// Now handled by plugins.click_to_play -pref("noscript.forbidFlash", false); -pref("noscript.forbidSilverlight", false); -pref("noscript.forbidJava", false); -pref("noscript.forbidPlugins", false); -// Usability tweaks -pref("noscript.showPermanent", false); -pref("noscript.showTempAllowPage", true); -pref("noscript.showRevokeTemp", true); -pref("noscript.notify", false); -pref("noscript.autoReload", true); -pref("noscript.autoReload.allTabs", false); -pref("noscript.cascadePermissions", true); -pref("noscript.restrictSubdocScripting", true); -pref("noscript.showVolatilePrivatePermissionsToggle", false); -pref("noscript.volatilePrivatePermissions", true); -pref("noscript.clearClick", 0); - -# PDF.js -// needs to be a user_pref because pdf.js blows away non-user prefs with its own -// defaults each time -user_pref("pdfjs.disableRange", true); diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 50fdc30..5456ad1 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -12,7 +12,9 @@ mkdir -p $OUTDIR # directory named tor-browser (instead of tor-browser_en-US). Therefore we # stage everything under tor-browser-stage to avoid a conflict. TB_STAGE_DIR=$distdir/tor-browser-stage -EXTOVERRIDESPATH=$rootdir/Bundle-Data/PTConfigs/extension-overrides.js +GENERATEDPREFSPATH=$rootdir/Bundle-Data/PTConfigs/generated-prefs.js +# Create initially empty prefs file where we can dump our conditionally included/genetered prefs +touch "$GENERATEDPREFSPATH" [% IF c("var/osx") %] TBDIR="$TB_STAGE_DIR/Tor Browser.app" @@ -113,9 +115,9 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T [% IF c("var/linux") -%] [% IF ! c("var/snowflake") %] grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ - >> "$EXTOVERRIDESPATH" + >> "$GENERATEDPREFSPATH" [% ELSE %] - cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$EXTOVERRIDESPATH" + cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH" [% END %] [% END -%] [% IF c("var/windows") -%] @@ -123,13 +125,13 @@ cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$T # We don't have fte available on Windows x86_64 yet grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF c("var/windows-x86_64") %]| grep -v 'default_bridge\.fte' [% END %] \ - >> "$EXTOVERRIDESPATH" + >> "$GENERATEDPREFSPATH" [% END -%] [% IF c("var/osx") -%] # FTE is temporarily removed due to bug 18495. grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js \ [% IF ! c("var/snowflake") %]| grep -v 'default_bridge\.snowflake' [% END %] \ - >> "$EXTOVERRIDESPATH" + >> "$GENERATEDPREFSPATH" [% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/user.js" @@ -143,7 +145,7 @@ cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> "$TBDIR/$MEEKPROFILEPATH/u [% END %] [% IF ! c("var/multi_lingual") %] - echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$EXTOVERRIDESPATH" + echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH" [% END %] [% IF c("var/linux") %] @@ -171,7 +173,7 @@ mv chrome/en-US/locale/browser/searchplugins $rootdir rm -rf chrome/en-US unzip omni.ja defaults/preferences/000-tor-browser.js || [ $? -lt 3 ] # Append our built extension-overrides.js to 000-tor-browser.js -cat "$EXTOVERRIDESPATH" >> defaults/preferences/000-tor-browser.js +cat "$GENERATEDPREFSPATH" >> defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js $rootdir [% IF c("var/osx") %] # Embed our default bookmarks within the en-US locale.

1 0

[tor-browser-build/master] Bug 26450: disable dependency on firefox-langpacks in testbuild
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 88ff6003f2d8b45aca111e2f7cfcce3837fe5414 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 22 00:09:30 2018 +0200 Bug 26450: disable dependency on firefox-langpacks in testbuild When the list of locales is empty (testbuild), we don't need the firefox-langpacks. --- projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 820755c..13c550d 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -47,6 +47,7 @@ input_files: name: tor - project: firefox-langpacks name: firefox-langpacks + enable: '[% c("var/locales").size %]' - project: tor-launcher name: tor-launcher - project: torbutton

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26450'
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 71207ea2468a8535e73dc8e8aa09aecfedbbed34 Merge: 660007a 88ff600 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 29 11:33:04 2018 +0000 Merge remote-tracking branch 'boklm/bug_26450' projects/tor-browser/config | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Bug 26410: Stop using old MAR format in the next esr60-based alpha
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 2846221abfaeb05837e7d4a2056741df555dbd5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 28 14:29:24 2018 +0200 Bug 26410: Stop using old MAR format in the next esr60-based alpha However we keep setting MAR_OLD_FORMAT=1 on the stable release for now. --- Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3b5c2d9..b667960 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ incrementals-release: submodule-update incrementals-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals tools/update-responses/download_missing_versions alpha - MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + tools/update-responses/gen_incrementals alpha $(rbm) build release --step hash_incrementals --target alpha update_responses-release: submodule-update @@ -138,9 +138,9 @@ dmg2mar-release: submodule-update dmg2mar-alpha: submodule-update $(rbm) build release --step update_responses_config --target alpha --target signed - MAR_OLD_FORMAT=1 $(rbm) build release --step dmg2mar --target alpha --target signed + $(rbm) build release --step dmg2mar --target alpha --target signed tools/update-responses/download_missing_versions alpha - CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 MAR_OLD_FORMAT=1 tools/update-responses/gen_incrementals alpha + CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha submodule-update: git submodule update --init diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 0c3e583..50fdc30 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -264,9 +264,11 @@ popd cd $distdir [% IF c("var/build_mar") -%] - # Let's use the bzip2 format for now so that users can update to the first - # esr60-based Tor Browser. - export MAR_OLD_FORMAT=1 + [% IF c("var/release") -%] + # Let's use the bzip2 format for now so that users can update to the first + # esr60-based Tor Browser. + export MAR_OLD_FORMAT=1 + [% END -%] # Create full MAR file and compressed package. MAR_FILE=tor-browser-[% c("var/mar_osname") %]-[% c("var/torbrowser_version") %]_${PKG_LOCALE}.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "$TBDIR"

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_26410'
by gk＠torproject.org 29 Jun '18

29 Jun '18

commit 660007aa541e3c8cc4fda2776e8a277fdbc74915 Merge: c2f11e3 2846221 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 29 11:29:06 2018 +0000 Merge remote-tracking branch 'boklm/bug_26410' Makefile | 6 +++--- projects/tor-browser/build | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-)

1 0

[tor-browser-build/master] Fix HTTPS Everywhere version in the changelog
by boklm＠torproject.org 29 Jun '18

29 Jun '18

commit c2f11e3720f2a5429f4cd32af73b94d655002712 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 29 12:32:39 2018 +0200 Fix HTTPS Everywhere version in the changelog Reported in a comment on the blog: https://blog.torproject.org/comment/275985#comment-275985 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 5f52bbe..516e81f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -20,7 +20,7 @@ Tor Browser 8.0a9 -- June 27 2018 * Bug 20890: Increase control port connection timeout * Bug 20628: Add more locales to Tor Browser * Translations update - * Update HTTPS Everywhere to 2018.6.13 + * Update HTTPS Everywhere to 2018.6.21 * Update NoScript to 10.1.8.2 * Bug 25543: Rebase Tor Browser patches for ESR60 * Bug 23247: Show security state of .onions

1 0