- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-45.1.1esr-6.0-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 31 May '16

31 May '16

commit 9a9765a3cb73e7341b7c2494c167725b4f688c07 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri May 20 16:20:18 2016 -0700 squash! TB3: Tor Browser's official .mozconfigs. Bug 18884: Disable Loop extension --- .mozconfig | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 4 files changed, 4 insertions(+) diff --git a/.mozconfig b/.mozconfig index eb36301..dc2e63b 100755 --- a/.mozconfig +++ b/.mozconfig @@ -25,3 +25,4 @@ ac_add_options --disable-webrtc # (Apart from that there is no Adobe CRM module for Linux right now) ac_add_options --disable-eme #ac_add_options --disable-ctypes +ac_add_options --disable-loop diff --git a/.mozconfig-asan b/.mozconfig-asan index faa195e..1a723cf 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -32,3 +32,4 @@ ac_add_options --disable-crashreporter ac_add_options --disable-webrtc #ac_add_options --disable-ctypes ac_add_options --disable-eme +ac_add_options --disable-loop diff --git a/.mozconfig-mac b/.mozconfig-mac index c5ca087..96f036a 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -54,3 +54,4 @@ ac_add_options --disable-tests # (Apart from that there is no Adobe CRM module for OS X right now) ac_add_options --disable-eme # ac_add_options --disable-ctypes +ac_add_options --disable-loop diff --git a/.mozconfig-mingw b/.mozconfig-mingw index c40881c..33ea6d4 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -29,3 +29,4 @@ ac_add_options --disable-webrtc ac_add_options --disable-tests #ac_add_options --disable-ctypes +ac_add_options --disable-loop

1 0

[tor-browser/tor-browser-45.1.1esr-6.0-1] Bug 1233963 - Work around recent GNU gold behavior with segments starting before the first section they contain
by gk＠torproject.org 31 May '16

31 May '16

commit 1ad955bf2c0a772599f46d2247f06d89508b6d76 Author: Mike Hommey <mh+mozilla(a)glandium.org> Date: Tue Jan 19 14:31:04 2016 +0900 Bug 1233963 - Work around recent GNU gold behavior with segments starting before the first section they contain --- build/unix/elfhack/elf.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/unix/elfhack/elf.cpp b/build/unix/elfhack/elf.cpp index 666b535..743afde 100644 --- a/build/unix/elfhack/elf.cpp +++ b/build/unix/elfhack/elf.cpp @@ -258,7 +258,10 @@ Elf::Elf(std::ifstream &file) segment->addSection(sections[j]); // Make sure that our view of segments corresponds to the original // ELF file. - assert(segment->getFileSize() == phdr.p_filesz); + // GNU gold likes to start some segments before the first section + // they contain. https://sourceware.org/bugzilla/show_bug.cgi?id=19392 + unsigned int gold_adjustment = segment->getAddr() - phdr.p_vaddr; + assert(segment->getFileSize() == phdr.p_filesz - gold_adjustment); // gold makes TLS segments end on an aligned virtual address, even // when the underlying section ends before that, while bfd ld // doesn't. It's fine if we don't keep that alignment. @@ -267,7 +270,7 @@ Elf::Elf(std::ifstream &file) unsigned int align = segment->getAlign(); memsize = (memsize + align - 1) & ~(align - 1); } - assert(memsize == phdr.p_memsz); + assert(memsize == phdr.p_memsz - gold_adjustment); segments.push_back(segment); }

1 0

[tor-browser-bundle/master] Fix changelog
by gk＠torproject.org 30 May '16

30 May '16

commit a6a9bb3c2b287bd9885d3022c195ad6459c1de7d Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 30 08:08:49 2016 +0000 Fix changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7f4df5b..26b3e4e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,7 @@ Tor Browser 6.0 -- May 30 * Bug 18904: Mac OS: meek-http-helper profile not updated * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 * Bug 18900: Fix broken updater on Linux + * Bug 19121: The update.xml hash should get checked during update * Bug 18042: Disable SHA1 certificate support * Bug 18821: Disable libmdns support for desktop and mobile * Bug 18848: Disable additional welcome URL shown on first start

1 0

[tor-browser-bundle/hardened-builds] Bug 19176: Zip language packs deterministically
by gk＠torproject.org 26 May '16

26 May '16

commit c07734b821db00b031e5736edc6c8a1ec2ff37f0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 26 07:26:37 2016 +0000 Bug 19176: Zip language packs deterministically --- gitian/descriptors/linux/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 3e8ae2e..e25d40e 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -209,7 +209,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index e046b57..84cb56c 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -218,7 +218,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 5473bf3..ab4f903 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -180,7 +180,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done

1 0

[tor-browser-bundle/master] Update Changelog
by gk＠torproject.org 26 May '16

26 May '16

commit 417340b9cac4b449033ffde3e142dd4a5e8abc82 Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 26 08:13:43 2016 +0000 Update Changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index fc1a14b..7f4df5b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -46,6 +46,7 @@ Tor Browser 6.0 -- May 30 * Bug 18703: Fix circuit isolation issues on Page Info dialog * bug 19115: Tor Browser should not fall back to Bing as its search engine * Bug 18915+19065: Use our search plugins in localized builds + * Bug 19176: Zip our language packs deterministically * Bug 18811: Fix first-party isolation for blobs URLs in Workers * Bug 18950: Disable or audit Reader View * Bug 18886: Remove Pocket

1 0

[tor-browser-bundle/master] Bug 19176: Zip language packs deterministically
by gk＠torproject.org 26 May '16

26 May '16

commit 3b3fadf67339bbc1caaf9b7569ed829e1455a16f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 26 07:26:37 2016 +0000 Bug 19176: Zip language packs deterministically --- gitian/descriptors/linux/gitian-bundle.yml | 2 +- gitian/descriptors/mac/gitian-bundle.yml | 2 +- gitian/descriptors/windows/gitian-bundle.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 20315ec..0316148 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -219,7 +219,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 1d200b5..a1a4ed8 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -266,7 +266,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index da65142..d065f60 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -189,7 +189,7 @@ script: | cp -rf ~/build/searchplugins $search_plugins_path rm $xpi cd prep_$LANG - zip -r9 ../$xpi * + ~/build/dzip.sh ../$xpi . cd .. rm -rf prep_$LANG done

1 0

[tor-browser-bundle/master] Release preparations for 6.0
by gk＠torproject.org 25 May '16

25 May '16

commit 9a069e0bc70e905fb44897370f57bb4d1d67a599 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 25 07:59:20 2016 +0000 Release preparations for 6.0 Version bumps, changelog update and config.yml update --- Bundle-Data/Docs/ChangeLog.txt | 91 +++++++++++++++++++++++++++++++++++++++ gitian/versions | 38 ++++++++++------ tools/update-responses/config.yml | 12 +++--- 3 files changed, 121 insertions(+), 20 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b96cb79..fc1a14b 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,94 @@ +Tor Browser 6.0 -- May 30 + * All Platforms + * Update Firefox to 45.1.1esr + * Update OpenSSL to 1.0.1t + * Update Torbutton to 1.9.5.4 + * Bug 18466: Make Torbutton compatible with Firefox ESR 45 + * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu + * Bug 18905: Hide unusable items from help menu + * Bug 16017: Allow users to more easily set a non-tor SSH proxy + * Bug 17599: Provide shortcuts for New Identity and New Circuit + * Translation updates + * Code clean-up + * Update Tor Launcher to 0.2.9.3 + * Bug 13252: Do not store data in the application bundle + * Bug 18947: Tor Browser is not starting on OS X if put into /Applications + * Bug 11773: Setup wizard UI flow improvements + * Translation updates + * Update HTTPS-Everywhere to 5.1.9 + * Update meek to 0.22 (tag 0.22-18371-3) + * Bug 18371: Symlinks are incompatible with Gatekeeper signing + * Bug 18904: Mac OS: meek-http-helper profile not updated + * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45 + * Bug 18900: Fix broken updater on Linux + * Bug 18042: Disable SHA1 certificate support + * Bug 18821: Disable libmdns support for desktop and mobile + * Bug 18848: Disable additional welcome URL shown on first start + * Bug 14970: Exempt our extensions from signing requirement + * Bug 16328: Disable MediaDevices.enumerateDevices + * Bug 16673: Disable HTTP Alternative-Services + * Bug 17167: Disable Mozilla's tracking protection + * Bug 18603: Disable performance-based WebGL fingerprinting option + * Bug 18738: Disable Selfsupport and Unified Telemetry + * Bug 18799: Disable Network Tickler + * Bug 18800: Remove DNS lookup in lockfile code + * Bug 18801: Disable dom.push preferences + * Bug 18802: Remove the JS-based Flash VM (Shumway) + * Bug 18863: Disable MozTCPSocket explicitly + * Bug 15640: Place Canvas MediaStream behind site permission + * Bug 16326: Verify cache isolation for Request and Fetch APIs + * Bug 18741: Fix OCSP and favicon isolation for ESR 45 + * Bug 16998: Disable <link rel="preconnect"> for now + * Bug 18898: Exempt the meek extension from the signing requirement as well + * Bug 18899: Don't copy Torbutton, TorLauncher, etc. into meek profile + * Bug 18890: Test importScripts() for cache and network isolation + * Bug 18886: Hide pocket menu items when Pocket is disabled + * Bug 18703: Fix circuit isolation issues on Page Info dialog + * bug 19115: Tor Browser should not fall back to Bing as its search engine + * Bug 18915+19065: Use our search plugins in localized builds + * Bug 18811: Fix first-party isolation for blobs URLs in Workers + * Bug 18950: Disable or audit Reader View + * Bug 18886: Remove Pocket + * Bug 18619: Tor Browser reports "InvalidStateError" in browser console + * Bug 18945: Disable monitoring the connected state of Tor Browser users + * Bug 18855: Don't show error after add-on directory clean-up + * Bug 18885: Disable the option of logging TLS/SSL key material + * Bug 18770: SVGs should not show up on Page Info dialog when disabled + * Bug 18958: Spoof screen.orientation values + * Bug 19047: Disable Heartbeat prompts + * Bug 18914: Use English-only label in <isindex/> tags + * Bug 18996: Investigate server logging in esr45-based Tor Browser + * Bug 17790: Add unit tests for keyboard fingerprinting defenses + * Bug 18995: Regression test to ensure CacheStorage is disabled + * Bug 18912: Add automated tests for updater cert pinning + * Bug 16728: Add test cases for favicon isolation + * Bug 18976: Remove some FTE bridges + * Windows + * Bug 13419: Support ICU in Windows builds + * Bug 16874: Fix broken https://sports.yahoo.com/dailyfantasy page + * Bug 18767: Context menu is broken on Windows in ESR 45 based Tor Browser + * OS X + * Bug 6540: Support OS X Gatekeeper + * Bug 13252: Tor Browser should not store data in the application bundle + * Bug 18951: HTTPS-E is missing after update + * Bug 18904: meek-http-helper profile not updated + * Bug 18928: Upgrade is not smooth (requires another restart) + * Build System + * All Platforms + * Bug 18127: Add LXC support for building with Debian guest VMs + * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds + * Bug 18919: Remove unused keys and unused dependencies + * Windows + * Bug 17895: Use NSIS 2.51 for installer to avoid DLL hijacking + * Bug 18290: Bump mingw-w64 commit we use + * OS X + * Bug 18331: Update toolchain for Firefox 45 ESR + * Bug 18690: Switch to Debian Wheezy guest VMs + * Linux + * Bug 18699: Stripping fails due to obsolete Browser/components directory + * Bug 18698: Include libgconf2-dev for our Linux builds + * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL) + Tor Browser 6.0a5-hardened -- April 28 2016 * All Platforms * Update Firefox to 45.1.0esr diff --git a/gitian/versions b/gitian/versions index a18afab..a3b3a1f 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,29 +5,35 @@ BUNDLE_LOCALES_WIN32="ja" BUNDLE_LOCALES_MAC="ja-JP-mac" BUILD_PT_BUNDLES=1 +# DATA_OUTSIDE_APP_DIR is only implemented for Mac OS. +DATA_OUTSIDE_APP_DIR=1 + VERIFY_TAGS=1 -FIREFOX_VERSION=38.6.0esr +FIREFOX_VERSION=45.1.1esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 TOR_TAG=tor-0.2.7.6 -TORLAUNCHER_TAG=0.2.7.8 -TORBUTTON_TAG=1.9.4.3 -HTTPSE_TAG=5.1.2 -NSIS_TAG=v0.3 +TORLAUNCHER_TAG=0.2.9.3 +TORBUTTON_TAG=1.9.5.4 +HTTPSE_TAG=5.1.9 +NSIS_TAG=v0.3.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.22-stable -MINGW_TAG=a883b47a45ff74ced41dfbd9f748d5c2c61f3c01 # due to bug 1156131 +CMAKE_TAG=v2.8.12.2 +LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 +CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 +MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 LIBFTE_TAG=85ef8ae58dbf0d02ea26b627e343784b5574c428 # sketch master with fix FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 -GOPTLIB_TAG=0.2 -MEEK_TAG=0.20 +GOPTLIB_TAG=0.5 +MEEK_TAG=0.22-18371-3 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd @@ -36,14 +42,15 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux +GITIAN_TAG=tor-browser-builder-4-1 -OPENSSL_VER=1.0.1q +OPENSSL_VER=1.0.1t GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION FIREFOX_LANG_BUILD=build1 BINUTILS_VER=2.24 GCC_VER=5.1.0 +CLANG_VER=r247539 PYTHON_VER=2.7.5 PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 @@ -59,8 +66,9 @@ NSIS_VER=2.51 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.11-fn+sm+fx.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz +CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MSVCR100_PACKAGE=msvcr100.dll @@ -86,12 +94,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7 +OPENSSL_HASH=4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba +NOSCRIPT_HASH=fdd965a69188ac651b08a7d3ada54821a89db10a4685aa73ba59edc0b8243390 +CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -116,6 +125,7 @@ NOTOTCFONT_HASH=e6b82f7d3dab605c428161124ceb5e169cde93de632d800297b167cdd88e7baa OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources… +CCTOOLS_URL=https://people.torproject.org/~gk/mirrors/sources/${CCTOOLS_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index a747fd6..55a767f 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -10,14 +10,14 @@ build_targets: osx64: Darwin_x86_64-gcc3 channels: alpha: 6.0a5 - release: 5.5 + release: 6.0 versions: - 5.5: - platformVersion: 38.6.0 - detailsURL: https://blog.torproject.org/blog/tor-browser-55-released - download_url: https://www.torproject.org/dist/torbrowser/5.5 + 6.0: + platformVersion: 45.1.1 + detailsURL: https://blog.torproject.org/blog/tor-browser-60-released + download_url: https://www.torproject.org/dist/torbrowser/6.0 incremental_from: - - 5.0.7 + - 5.5.5 migrate_archs: osx32: osx64 osx32:

1 0

[tor-browser/tor-browser-45.1.0esr-6.0-1] Bug 18914: Use English-only label in <isindex/> tags
by gk＠torproject.org 25 May '16

25 May '16

commit 4166668b7cf72bdb0666e53ecd1abdc41de90c23 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon May 23 18:14:43 2016 -0700 Bug 18914: Use English-only label in <isindex/> tags --- parser/html/nsHtml5TreeOperation.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/parser/html/nsHtml5TreeOperation.cpp b/parser/html/nsHtml5TreeOperation.cpp index 866e657..02357b5 100644 --- a/parser/html/nsHtml5TreeOperation.cpp +++ b/parser/html/nsHtml5TreeOperation.cpp @@ -474,11 +474,16 @@ nsHtml5TreeOperation::SetFormElement(nsIContent* aNode, nsIContent* aParent) nsresult nsHtml5TreeOperation::AppendIsindexPrompt(nsIContent* parent, nsHtml5DocumentBuilder* aBuilder) { + /* nsXPIDLString prompt; nsresult rv = nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES, "IsIndexPromptWithSpace", prompt); + */ + nsString prompt(NS_LITERAL_STRING( + "This is a searchable index. Enter search keywords:\u0020")); uint32_t len = prompt.Length(); + /* if (NS_FAILED(rv)) { return rv; } @@ -486,6 +491,7 @@ nsHtml5TreeOperation::AppendIsindexPrompt(nsIContent* parent, nsHtml5DocumentBui // Don't bother appending a zero-length text node. return NS_OK; } + */ return AppendText(prompt.BeginReading(), len, parent, aBuilder); }

1 0

[tor-launcher/maint-0.2.9] Bump version for new tag
by gk＠torproject.org 25 May '16

25 May '16

commit c1254f115537fc415d8c1ef22624b7a171afb4fe Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 24 20:33:24 2016 +0000 Bump version for new tag --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index c95315e..7598b60 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.9.2</em:version> + <em:version>0.2.9.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-launcher/maint-0.2.9] Bug 18947: not starting on OS X if put into /Applications
by gk＠torproject.org 25 May '16

25 May '16

commit 0f2d55e7426586d46e3d597b1e839908e2dd7c65 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon May 16 10:48:51 2016 -0400 Bug 18947: not starting on OS X if put into /Applications Display a better error message if tor exits and Tor Launcher was never able to establish a connection to the control port (pointing users to a possible error in their torrc may help them find and fix the startup problem themselves). --- src/components/tl-process.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index aba6456..403bc56 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -150,8 +150,25 @@ TorProcessService.prototype = { this.mProtocolSvc.TorCleanupConnection(); - var s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + let s; + if (!this.mDidConnectToTorControlPort) + { + // The "tor_exited_during_startup" property string was added in + // May 2016. If it is available, we use it; otherwise, we fall back + // to the older "tor_exited" message (below). Once this new string + // has been translated into all of the languages that we ship, we + // can simplify this code. + let key = "tor_exited_during_startup"; + s = TorLauncherUtil.getLocalizedString(key) + if (s == key) // No string found for key. + s = undefined; + } + + if (!s) + { + s = TorLauncherUtil.getLocalizedString("tor_exited") + "\n\n" + TorLauncherUtil.getLocalizedString("tor_exited2"); + } TorLauncherLogger.log(4, s); var defaultBtnLabel = TorLauncherUtil.getLocalizedString("restart_tor"); var cancelBtnLabel = "OK"; @@ -178,6 +195,7 @@ TorProcessService.prototype = var haveConnection = this.mProtocolSvc.TorHaveControlConnection(); if (haveConnection) { + this.mDidConnectToTorControlPort = true; this.mControlConnTimer = null; this.mTorProcessStatus = this.kStatusRunning; this.mProtocolSvc.TorStartEventMonitor(); @@ -285,6 +303,7 @@ TorProcessService.prototype = // Private Member Variables //////////////////////////////////////////////// mTorProcessStatus: 0, // kStatusUnknown + mDidConnectToTorControlPort: false, // Have we ever made a connection? mIsBootstrapDone: false, mBootstrapErrorOccurred: false, mIsQuitting: false,

1 0