- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 21326: Update the "Using a system-installed Tor" section.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 57fed3156c39a29d742a4f9a535edcea2cb733e0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index f556389..a78b367 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -316,17 +316,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor-browser-bundle/hardened-builds] Bug 21326: Update the "Using a system-installed Tor" section.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 46d7d6b7da4457bb60e2c69ddb79b5d17fa95ba1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 19c5cfc..2cd4d76 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -323,17 +323,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor-browser-bundle/hardened-builds] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 6bd92c5d7a8052b4603a3d0e2f9e412f8ac0d4b1 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index bd92585..c56d316 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,6 +37,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3");

1 0

[tor-browser-bundle/master] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 92c82fb6b5aa06c9ed4c304d47aca1bf3e92d1ca Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index bd92585..c56d316 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,6 +37,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3");

1 0

[tor-browser-build/master] Add Bill's new key
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit b37d4c632f91c92118aee21f301ba6262e29d5f1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 19 11:50:43 2017 +0000 Add Bill's new key --- keyring/https-everywhere.gpg | Bin 194393 -> 203297 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index fdd8d4f..f6a9dfc 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[tor-browser-build/master] Update tor version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit 2de1a92d2dea07c11ccbfabb031629906053668d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:07:20 2017 +0100 Update tor version --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index e2e556f..b73a447 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.2.9.6-rc +version: 0.3.0.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg

1 0

[tor-browser-build/master] Update https-everywhere version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit ed40d8b4441762e2a875b1ef4bc90c919ee6dddc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:13:40 2017 +0100 Update https-everywhere version --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 8611b80..557473d 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.2.8 +version: 5.2.9 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[tor-browser-build/master] Update torbutton version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit d8f79f68877eefc91c3b4afff2d46a8e2e4dad25 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:07:41 2017 +0100 Update torbutton version --- projects/torbutton/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/torbutton/config b/projects/torbutton/config index 71d10d8..5ff51f8 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.6.8 +version: 1.9.7 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg

1 0

[tor-browser-build/master] Update firefox version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit d241887e93f6aa4498b7867d632b68be96ad0969 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:17:41 2017 +0100 Update firefox version --- projects/firefox/config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0d1a4ac..52fc7c5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,15 @@ # 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") %]-6.5-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://git.torproject.org/tor-browser.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg remote_docker: 1 var: - firefox_version: 45.6.0esr + firefox_version: 45.7.0esr + torbrowser_branch: 7.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps:

1 0

[tor-browser-build/master] Fix typo and copyright date python helper
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit fce8c7dfd80c07744d8308d70c23e25caee07374 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 27 11:43:19 2017 +0000 Fix typo and copyright date python helper --- projects/tor-browser/pe_checksum_fix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/pe_checksum_fix.py b/projects/tor-browser/pe_checksum_fix.py index 101e77f..85d8fef 100755 --- a/projects/tor-browser/pe_checksum_fix.py +++ b/projects/tor-browser/pe_checksum_fix.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2015, The Tor Project, Inc. +# Copyright (c) 2015-2017, The Tor Project, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -37,7 +37,7 @@ SHA256 mismatch if one tries to check that the binary we offer is actually the the one we got from our reproducible builds. This small Python snippet does both things: It pads the .exe if necessary and it -recalculates the PE-file checksum. Details of the discussion can be foun in bug +recalculates the PE-file checksum. Details of the discussion can be found in bug 15339: https://bugs.torproject.org/15539. Thanks to a cypherpunk for this workaround idea.

1 0

[tor-browser-build/master] Bump NoScript version to 2.9.5.3
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit bb035e0a65cf13f9bb6b4048f1086c8effcfd8eb Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 10:52:11 2017 +0100 Bump NoScript version to 2.9.5.3 --- projects/tor-browser/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/config b/projects/tor-browser/config index d220913..9ec262b 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -43,9 +43,9 @@ input_files: - project: fonts name: fonts - filename: Bundle-Data - - 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: ed71ca922790e81bc5e8c6a87bb81f394a38676ac37d1fba518a6a428d128dd5 + sha256sum: ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd - filename: RelativeLink enable: '[% c("var/linux") %]' - project: libdmg-hfsplus

1 0

[tor-browser-build/master] Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit b53e849e92ca9defab6eede768ad85aad6e8e702 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jan 17 10:27:25 2017 -0500 Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2 Allow full read access to all files under /usr/lib. Allow full read access to /Library/Preferences/com.apple.ViewBridge.plist. Allow writes to TorBrowser-Data/Browser/profiles.ini (otherwise, a new browser profile is created each time the browser is opened). --- projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb b/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb index eda7a1f..385e914 100644 --- a/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb +++ b/projects/tor-browser/Bundle-Data/mac-sandbox/tb.sb @@ -28,6 +28,7 @@ (allow file-read* (path "/Library/Preferences/com.apple.HIToolbox.plist") + (path "/Library/Preferences/com.apple.ViewBridge.plist") (path "/Library/Preferences/.GlobalPreferences.plist") (path "/dev/random") (path "/dev/urandom") @@ -41,6 +42,7 @@ (subpath "/Library/Fonts") (subpath "/System") (subpath "/private/var/folders") + (subpath "/usr/lib") (subpath "/usr/share") (home-subpath "/Downloads") (home-subpath "/Library/Input Methods") @@ -66,7 +68,6 @@ (path "/private/var/db/.AppleSetupDone") (path "/tmp") (path "/var") - (subpath "/usr/lib") (torbrowser-data-dir-path "/Tor/control.socket") (torbrowser-data-dir-path "/Tor/socks.socket") (path-regex "/private/tmp/Tor[-0-9]*/control.socket") @@ -86,11 +87,6 @@ (path "/Library/Preferences/.GlobalPreferences.plist") ) -; Disallow writes to the profiles ini file. -(deny file-write* - (torbrowser-data-dir-subpath "/Browser/profiles.ini") -) - (allow iokit-open) (allow ipc-posix-shm

1 0

[tor-browser-build/master] binutils: build with hardening flags on Linux
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit 406904e68c064f29785d06f79d083170b85dee23 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 10:37:51 2017 +0100 binutils: build with hardening flags on Linux --- projects/binutils/build | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/projects/binutils/build b/projects/binutils/build index 11e25d6..3ff4bdb 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -1,6 +1,21 @@ #!/bin/sh set -e +rootdir=$(pwd) distdir=/var/tmp/dist/binutils +[% IF c("var/linux") %] + # Config options for hardening-wrapper + export DEB_BUILD_HARDENING=1 + export DEB_BUILD_HARDENING_STACKPROTECTOR=1 + export DEB_BUILD_HARDENING_FORTIFY=1 + export DEB_BUILD_HARDENING_FORMAT=1 + export DEB_BUILD_HARDENING_PIE=1 + + # The libstdc++ shipped by default is non-PIC which breaks the binutils build + # if we build with DEB_BUILD_HARDENING_PIE=1. We need to install a PIC one AND + # make sure it gets used before the non-PIC one would. + ln -s /usr/lib/gcc/x86_64-linux-gnu/4.7/libstdc++_pic.a libstdc++.a + export LDFLAGS="-L$rootdir -lstdc++" +[% END %] tar xf [% project %]-[% c("version") %].tar.bz2 cd [% project %]-[% c("version") %] [% IF c('var/windows') -%]

1 0

[tor-browser-bundle/master] Bug 21332: libcxx is not needed for snowflake support on Linux
by gk＠torproject.org 27 Jan '17

27 Jan '17

commit 6e78d453a906909c5051e33f23033f13186cad82 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 27 09:59:50 2017 +0000 Bug 21332: libcxx is not needed for snowflake support on Linux --- gitian/fetch-inputs.sh | 1 - gitian/verify-tags.sh | 1 - gitian/versions | 1 - gitian/versions.alpha | 1 - gitian/versions.nightly | 1 - 5 files changed, 5 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 8c543d8..0ae2df5 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -277,7 +277,6 @@ tor-browser https://git.torproject.org/tor-browser.git $TORBR cmake https://cmake.org/cmake.git $CMAKE_TAG llvm https://github.com/llvm-mirror/llvm $LLVM_TAG clang https://github.com/llvm-mirror/clang $CLANG_TAG -libcxx https://github.com/llvm-mirror/libcxx $LIBCXX_TAG mingw-w64-git http://git.code.sf.net/p/mingw-w64/mingw-w64 $MINGW_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 368a990..e8dfe3f 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -111,7 +111,6 @@ while read dir commit; do done << EOF llvm $LLVM_TAG clang $CLANG_TAG -libcxx $LIBCXX_TAG mingw-w64-git $MINGW_TAG libdmg-hfsplus $LIBDMG_TAG libfte $LIBFTE_TAG diff --git a/gitian/versions b/gitian/versions index 598a945..91bea14 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,6 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -LIBCXX_TAG=af9a44f256be54de6874d1eefd1d282d0671c0cf # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a6f1aac..0644778 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,6 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -LIBCXX_TAG=af9a44f256be54de6874d1eefd1d282d0671c0cf # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d181106..ac8cfd1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -32,7 +32,6 @@ LIBEVENT_TAG=release-2.0.22-stable CMAKE_TAG=v2.8.12.2 LLVM_TAG=8f188e0ea735ac9383a65a0d1c846eb790c2ec74 # r247539 CLANG_TAG=592b43b609b42cffd1531a700c140e10766bf049 # r247539 -LIBCXX_TAG=af9a44f256be54de6874d1eefd1d282d0671c0cf # r247539 MINGW_TAG=a0cd5afeb60be3be0860e9a203314c10485bb9b8 PYPTLIB_TAG=master OBFSPROXY_TAG=master

1 0

[tor-browser-bundle/master] Fix typo and copyright date python helper
by gk＠torproject.org 27 Jan '17

27 Jan '17

commit cad2bdae295d3d2e6bbcd63a195d758e265efd45 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 27 11:43:19 2017 +0000 Fix typo and copyright date python helper --- gitian/build-helpers/pe_checksum_fix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/build-helpers/pe_checksum_fix.py b/gitian/build-helpers/pe_checksum_fix.py index 101e77f..85d8fef 100755 --- a/gitian/build-helpers/pe_checksum_fix.py +++ b/gitian/build-helpers/pe_checksum_fix.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2015, The Tor Project, Inc. +# Copyright (c) 2015-2017, The Tor Project, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -37,7 +37,7 @@ SHA256 mismatch if one tries to check that the binary we offer is actually the the one we got from our reproducible builds. This small Python snippet does both things: It pads the .exe if necessary and it -recalculates the PE-file checksum. Details of the discussion can be foun in bug +recalculates the PE-file checksum. Details of the discussion can be found in bug 15339: https://bugs.torproject.org/15539. Thanks to a cypherpunk for this workaround idea.

1 0

[torbutton/master] Bug 21324: Don't update NoScript button with timer update
by gk＠torproject.org 26 Jan '17

26 Jan '17

commit 8bc9aef5b873eecdae32a34f69170006c31eeddc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 26 15:49:11 2017 +0000 Bug 21324: Don't update NoScript button with timer update --- src/chrome/content/torbutton.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 62b9371..990a990 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -140,9 +140,13 @@ var torbutton_unique_pref_observer = } return; } - + if (topic != "nsPref:changed") return; - if (data.startsWith("noscript.")) { + // Make sure the NoScript button shows the current NoScript state. We + // don't want to run the update function, though, if just a timer gets + // updated. Fixes bug 21324. + if (data.startsWith("noscript.") && + data !== "noscript.subscription.lastCheck") { torbutton_update_noscript_button(); } switch (data) {

1 0

[tor-launcher/maint-0.2.10] Bug 21264: Add a README file.
by gk＠torproject.org 26 Jan '17

26 Jan '17

commit e16b92f0db218f9441cdf5ae007a5807da520615 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 10:25:17 2017 -0500 Bug 21264: Add a README file. --- README | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/README b/README new file mode 100644 index 0000000..568acc1 --- /dev/null +++ b/README @@ -0,0 +1,50 @@ +PLEASE NOTE: + Tor Launcher is packaged with Tor Browser, Tor Messenger, and + other Tor-enabled applications and is designed for those + applications. You should not install and try to use it in + Mozilla Firefox or another Firefox-based browser. + +OVERVIEW +Tor Launcher is a browser extension that starts the tor process +(which connects the browser and other applications to the Tor +Network), and Tor Launcher helps people configure and use Tor. The +first window that you see when you start Tor Browser is displayed +by Tor Launcher. + +BUG TRACKER +Tor Launcher bugs and enhancement requests are tracked using the +Tor Project's Trac system. Open the following link to view a list +of open tickets: + https://trac.torproject.org/projects/tor/query?status=!closed&component=App… + +SOURCE CODE +The main Tor Launcher Git repository may be cloned by using either +of these URLs: + https://git.torproject.org/tor-launcher.git + http://dccbbv6cooddgcrq.onion/tor-launcher.git + +A browsable view of the code is available via: + https://gitweb.torproject.org/tor-launcher.git + +The main development branch is master, which is currently used for +the hardened Tor Browser releases. Maintenance branches are used +for other product releases; e.g., maint-0.2.10 is a branch that is +used for releases in the Tor Browser 6.5 series. + +BUILDING TOR LAUNCHER +Official builds of Tor Launcher are done as part of a larger +application build process. For example, look here for information +about the Tor Browser build process: + https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking + +If you want to build your own standalone copy of Tor Launcher in +order to test a translation or code change that you have made, run +the following command: + make package + +The resulting xpi file is created in a subdirectory named pkg. + +CONTACTING THE DEVELOPERS +To contact the Tor Launcher developers, use the #tor-dev channel +on irc.oftc.net or post a message to the tbb-dev mailing list (see +https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev).

1 0

[tor-launcher/master] Bug 21264: Add a README file.
by brade＠torproject.org 26 Jan '17

26 Jan '17

commit fd0ae33ec9af248ebbcea8774a0349a2aa1413ca Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 10:25:17 2017 -0500 Bug 21264: Add a README file. --- README | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/README b/README new file mode 100644 index 0000000..568acc1 --- /dev/null +++ b/README @@ -0,0 +1,50 @@ +PLEASE NOTE: + Tor Launcher is packaged with Tor Browser, Tor Messenger, and + other Tor-enabled applications and is designed for those + applications. You should not install and try to use it in + Mozilla Firefox or another Firefox-based browser. + +OVERVIEW +Tor Launcher is a browser extension that starts the tor process +(which connects the browser and other applications to the Tor +Network), and Tor Launcher helps people configure and use Tor. The +first window that you see when you start Tor Browser is displayed +by Tor Launcher. + +BUG TRACKER +Tor Launcher bugs and enhancement requests are tracked using the +Tor Project's Trac system. Open the following link to view a list +of open tickets: + https://trac.torproject.org/projects/tor/query?status=!closed&component=App… + +SOURCE CODE +The main Tor Launcher Git repository may be cloned by using either +of these URLs: + https://git.torproject.org/tor-launcher.git + http://dccbbv6cooddgcrq.onion/tor-launcher.git + +A browsable view of the code is available via: + https://gitweb.torproject.org/tor-launcher.git + +The main development branch is master, which is currently used for +the hardened Tor Browser releases. Maintenance branches are used +for other product releases; e.g., maint-0.2.10 is a branch that is +used for releases in the Tor Browser 6.5 series. + +BUILDING TOR LAUNCHER +Official builds of Tor Launcher are done as part of a larger +application build process. For example, look here for information +about the Tor Browser build process: + https://trac.torproject.org/projects/tor/wiki/doc/TorBrowser/Hacking + +If you want to build your own standalone copy of Tor Launcher in +order to test a translation or code change that you have made, run +the following command: + make package + +The resulting xpi file is created in a subdirectory named pkg. + +CONTACTING THE DEVELOPERS +To contact the Tor Launcher developers, use the #tor-dev channel +on irc.oftc.net or post a message to the tbb-dev mailing list (see +https://lists.torproject.org/cgi-bin/mailman/listinfo/tbb-dev).

1 0

[tor-browser-bundle/hardened-builds] Bug 21318: Use MAKEOPTS for GMP build
by gk＠torproject.org 25 Jan '17

25 Jan '17

commit 1d289e1565405dbb8f328d466716dc754db96017 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 25 13:42:29 2017 +0000 Bug 21318: Use MAKEOPTS for GMP build --- gitian/descriptors/linux/gitian-utils.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 2d095d0..a0590e3 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -141,7 +141,7 @@ script: | # --enable-fat makes the binaries slightly bigger but fixes reproducibility # issues when compiling on LXC. See bug 12238 comment 4. ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx --enable-fat - make + make $MAKEOPTS make install cd ..

1 0

[tor-browser-bundle/master] Bug 21318: Use MAKEOPTS for GMP build
by gk＠torproject.org 25 Jan '17

25 Jan '17

commit 18bb5d3c20f563f774a7c935b1572f60d6330a06 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 25 13:42:29 2017 +0000 Bug 21318: Use MAKEOPTS for GMP build --- gitian/descriptors/linux/gitian-utils.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index b5246f4..d10422b 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -120,7 +120,7 @@ script: | # --enable-fat makes the binaries slightly bigger but fixes reproducibility # issues when compiling on LXC. See bug 12238 comment 4. ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx --enable-fat - make + make $MAKEOPTS make install cd ..

1 0

[tor-browser-bundle/hardened-builds] Bumping tor-browser version for nightlies
by gk＠torproject.org 25 Jan '17

25 Jan '17

commit 4c0f692080130b43026f697859faaeb00f8fc5ef Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 25 13:15:21 2017 +0000 Bumping tor-browser version for nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index cb196ed..dca64e1 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.6.0esr +FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser-bundle/master] Bumping tor-browser version for nightlies
by gk＠torproject.org 25 Jan '17

25 Jan '17

commit 9ee3e37518262391c1aec31341ca26aff2efee42 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 25 13:15:21 2017 +0000 Bumping tor-browser version for nightlies --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0ca5ed6..d181106 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -17,11 +17,11 @@ MULTI_LINGUAL=1 VERIFY_TAGS=0 -FIREFOX_VERSION=45.6.0esr +FIREFOX_VERSION=45.7.0esr TORBROWSER_UPDATE_CHANNEL=default -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.5-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master

1 0

[tor-browser-bundle/master] Folding in stable and hardened changelog
by gk＠torproject.org 25 Jan '17

25 Jan '17

commit 966ccee3a7f6ecd5dd8d09f13bc2841cc2dab754 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 25 13:12:21 2017 +0000 Folding in stable and hardened changelog --- Bundle-Data/Docs/ChangeLog.txt | 115 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f5d9a92..6dc7b45 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,24 @@ +Tor Browser 7.0a1-hardened -- January 25 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.3.0.2-alpha + * Update Torbutton to 1.9.7 + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 21243: Add links to es, fr, and pt Tor Browser manual + * Bug 21194: Show snowflake in the circuit display + * Bug 21131: Remove 2016 donation banner + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 20589: Add new MAR signing key + * Bug 20735: Add snowflake pluggable transport to alpha Linux builds + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + Tor Browser 7.0a1 -- January 25 2017 * All Platforms * Update Firefox to 45.7.0esr @@ -27,6 +48,100 @@ Tor Browser 7.0a1 -- January 25 2017 * Linux * Bug 21103: Update descriptors for sandboxed-tor-browser 0.0.3 +Tor Browser 6.5 -- January 24 2017 + * All Platforms + * Update Firefox to 45.7.0esr + * Tor to 0.2.9.9 + * OpenSSL to 1.0.2j + * Update Torbutton to 1.9.6.12 + * Bug 16622: Timezone spoofing moved to tor-browser.git + * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git + * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy + * Bug 20701: Allow the directory listing stylesheet in the content policy + * Bug 19837: Whitelist internal URLs that Firefox requires for media + * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client + * Bug 19273: Improve external app launch handling and associated warnings + * Bug 15852: Remove/synchronize Torbutton SOCKS pref logic + * Bug 19733: GETINFO response parser doesn't handle AF_UNIX entries + IPv6 + * Bug 17767: Make "JavaScript disabled" more visible in Security Slider + * Bug 20556: Use pt-BR strings from now on + * Bug 20614: Add links to Tor Browser User Manual + * Bug 20414: Fix non-rendering arrow on OS X + * Bug 20728: Fix bad preferences.xul dimensions + * Bug 19898: Use DuckDuckGo on about:tor + * Bug 21091: Hide the update check menu entry when running under the sandbox + * Bug 19459: Move resizing code to tor-browser.git + * Bug 20264: Change security slider to 3 options + * Bug 20347: Enhance security slider's custom mode + * Bug 20123: Disable remote jar on all security levels + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 17546: Add tooltips to explain our privacy checkboxes + * Bug 17904: Allow security settings dialog to resize + * Bug 18093: Remove 'Restore Defaults' button + * Bug 20373: Prevent redundant dialogs opening + * Bug 20318: Remove helpdesk link from about:tor + * Bug 21243: Add links for pt, es, and fr Tor Browser manuals + * Bug 20753: Remove obsolete StartPage locale strings + * Bug 21131: Remove 2016 donation banner + * Bug 18980: Remove obsolete toolbar button code + * Bug 18238: Remove unused Torbutton code and strings + * Bug 20388+20399+20394: Code clean-up + * Translation updates + * Update Tor Launcher to 0.2.10.3 + * Bug 19568: Set CurProcD for Thunderbird/Instantbird + * Bug 19432: Remove special handling for Instantbird/Thunderbird + * Translation updates + * Update HTTPS-Everywhere to 5.2.9 + * Update NoScript to 2.9.5.3 + * Bug 16622: Spoof timezone with Firefox patch + * Bug 17334: Spoof referrer when leaving a .onion domain + * Bug 19273: Write C++ patch for external app launch handling + * Bug 19459: Size new windows to 1000x1000 or nearest 200x100 (Firefox patch) + * Bug 12523: Mark JIT pages as non-writable + * Bug 20123: Always block remote jar files + * Bug 19193: Reduce timing precision for AudioContext, HTMLMediaElement, and MediaStream + * Bug 19164: Remove support for SHA-1 HPKP pins + * Bug 19186: KeyboardEvents are only rounding to 100ms + * Bug 16998: Isolate preconnect requests to URL bar domain + * Bug 19478: Prevent millisecond resolution leaks in File API + * Bug 20471: Allow javascript: links from HTTPS first party pages + * Bug 20244: Move privacy checkboxes to about:preferences#privacy + * Bug 20707: Fix broken preferences tab in non-en-US alpha bundles + * Bug 20709: Fix wrong update URL in alpha bundles + * Bug 19481: Point the update URL to aus1.torproject.org + * Bug 20556: Start using pt-BR instead of pt-PT for Portuguese + * Bug 20442: Backport fix for local path disclosure after drag and drop + * Bug 20160: Backport fix for broken MP3-playback + * Bug 20043: Isolate SharedWorker script requests to first party + * Bug 18923: Add script to run all Tor Browser regression tests + * Bug 20651: DuckDuckGo does not work with JavaScript disabled + * Bug 19336+19835: Enhance about:tbupdate page + * Bug 20399+15852: Code clean-up + * Windows + * Bug 20981: On Windows, check TZ for timezone first + * Bug 18175: Maximizing window and restarting leads to non-rounded window size + * Bug 13437: Rounded inner window accidentally grows to non-rounded size + * OS X + * Bug 20590: Badly resized window due to security slider notification bar on OS X + * Bug 20439: Make the build PIE on OSX + * Linux + * Bug 20691: Updater breaks if unix domain sockets are used + * Bug 15953: Weird resizing dance on Tor Browser startup + * Build system + * All platforms + * Bug 20927: Upgrade Go to 1.7.4 + * Bug 20583: Make the downloads.json file reproducible + * Bug 20133: Don't apply OpenSSL patch anymore + * Bug 19528: Set MOZ_BUILD_DATE based on Firefox version + * Bug 18291: Remove some uses of libfaketime + * Bug 18845: Make zip and tar helpers generate reproducible archives + * OS X + * Bug 20258: Make OS X Tor archive reproducible again + * Bug 20184: Make OS X builds reproducible (use clang for compiling tor) + * Bug 19856: Make OS X builds reproducible (getting libfaketime back) + * Bug 19410: Fix incremental updates by taking signatures into account + * Bug 20210: In dmg2mar, extract old mar file to copy permissions to the new one + Tor Browser 6.5a6-hardened -- December 14 2016 * All Platforms * Update Firefox to 45.6.0esr

1 0

[tor-browser-build/master] macosx-toolchain: remove unused variables
by boklm＠torproject.org 24 Jan '17

24 Jan '17

commit 288f5223ca434226cc376f0802a58a974b8e3d4b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 24 12:51:38 2017 +0100 macosx-toolchain: remove unused variables macosx-toolchain is currently used in two components: firefox and tor. In the firefox build we don't use those (unexported) variables. In the tor build we only use CFLAGS and CXXFLAGS through the configure options, and we move them to var/FLAGS in rbm.conf. --- projects/macosx-toolchain/config | 9 --------- rbm.conf | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 0bf4575..6458485 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -11,15 +11,6 @@ var: export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin export PATH="$clangdir/helpers:$clangdir/bin:$cctoolsdir:$PATH" export LD_LIBRARY_PATH=/var/tmp/dist/[% project %]/clang/lib - CFLAGS="-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" - CXXFLAGS="$CFLAGS" - CC="$clangdir/helpers/clang $CFLAGS" - CXX="$clangdir/helpers/clang++ $CXXFLAGS" - RANLIB=$cctoolsdir/x86_64-apple-darwin10-ranlib - AR=$cctoolsdir/x86_64-apple-darwin10-ar - AS=$cctoolsdir/x86_64-apple-darwin10-as - LD=$cctoolsdir/x86_64-apple-darwin10-ld - STRIP=$cctoolsdir/x86_64-apple-darwin10-strip input_files: - name: llvm diff --git a/rbm.conf b/rbm.conf index cbd725f..05e45a6 100644 --- a/rbm.conf +++ b/rbm.conf @@ -131,7 +131,8 @@ targets: osx: 1 osname: osx-x86_64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang $CFLAGS" CXX="x86_64-apple-darwin10-clang++ $CXXFLAGS"' + configure_opt: '--host=x86_64-apple-darwin10 CC="x86_64-apple-darwin10-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin10-clang++ [% c("var/FLAGS") %]"' + FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" locale_ja: ja-JP-mac deps: - build-essential

1 0

[tor-browser-build/master] Test commit (remove superfluous whitespace)
by gk＠torproject.org 23 Jan '17

23 Jan '17

commit 0159ed07a8c37f04637bf7d59bbbb35949caec63 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jan 23 21:10:17 2017 +0000 Test commit (remove superfluous whitespace) --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index a1d57c6..0b8e510 100644 --- a/README +++ b/README @@ -46,7 +46,7 @@ Starting a build To start a build, run one of the following commands, depending on the channel you want to build: - + $ make release $ make alpha $ make nightly

1 0