- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 09 Oct '14

09 Oct '14

commit f52b2a0e1b8aaa88b2c64b6dee7290dd92113d89 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 18:47:29 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug #13346: disable "slow to start" warning. --- browser/app/profile/000-tor-browser.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0a16f35..e0eb834 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -12,6 +12,12 @@ pref("browser.startup.homepage_override.mstone", "ignore"); pref("startup.homepage_welcome_url", ""); pref("startup.homepage_override_url", ""); +// Disable "Slow startup" warnings and associated disk history +// (bug #13346) +pref("browser.slowStartup.notificationDisabled", true); +pref("browser.slowStartup.maxSamples", 0); +pref("browser.slowStartup.samples", 0); + // Disk activity: Disable Browsing History Storage pref("browser.privatebrowsing.autostart", true); pref("browser.cache.disk.enable", false);

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 30bdf17443a32c902f623af4de0736adb3976b25 Merge: 58b604e 5630a27 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 14:23:52 2014 -0700 Merge remote-tracking branch 'brade/bug4234-esr31-fixup-01' into tor-browser-31.1.1esr-4.x-1 tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13356: symlinks missing after complete update.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 5630a27f53486655c14eae06276989f4e10632ef Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Oct 7 17:17:08 2014 -0400 Bug 13356: symlinks missing after complete update. Include the symlink remove and add directives in the updatev2.manifest file that is used by 4.0-alpha-3 browsers (as well as in the updatev3.manifest file that is used by ESR31-based browsers). --- tools/update-packaging/common.sh | 4 +++- tools/update-packaging/make_full_update.sh | 4 ++-- tools/update-packaging/make_incremental_update.sh | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/update-packaging/common.sh b/tools/update-packaging/common.sh index ecdc5dd..7f93a21 100755 --- a/tools/update-packaging/common.sh +++ b/tools/update-packaging/common.sh @@ -115,9 +115,11 @@ make_add_if_not_instruction() { make_addsymlink_instruction() { link="$1" target="$2" - filev3="$3" + filev2="$3" + filev3="$4" verbose_notice " addsymlink: $link -> $target" + echo "addsymlink \"$link\" \"$target\"" >> "$filev2" echo "addsymlink \"$link\" \"$target\"" >> "$filev3" } diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 77c3de3..b5813f2 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -124,12 +124,12 @@ for ((i=0; $i<$num_files; i=$i+1)); do done notice "" -notice "Adding symlink add instructions to file 'updatev3.manifest'" +notice "Adding symlink add instructions to update manifests" num_symlinks=${#symlinks[*]} for ((i=0; $i<$num_symlinks; i=$i+1)); do link="${symlinks[$i]}" target="${symlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done # Append remove instructions for any dead files. diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index fb5313f..60c5a4b 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -249,11 +249,12 @@ done # Remove and re-add symlinks notice "" -notice "Adding symlink remove/add instructions to file 'updatev3.manifest'" +notice "Adding symlink remove/add instructions to update manifests" num_oldsymlinks=${#oldsymlinks[*]} for ((i=0; $i<$num_oldsymlinks; i=$i+1)); do link="${oldsymlinks[$i]}" verbose_notice " remove: $link" + echo "remove \"$link\"" >> "$updatemanifestv2" echo "remove \"$link\"" >> "$updatemanifestv3" done @@ -261,7 +262,7 @@ num_newsymlinks=${#newsymlinks[*]} for ((i=0; $i<$num_newsymlinks; i=$i+1)); do link="${newsymlinks[$i]}" target="${newsymlink_targets[$i]}" - make_addsymlink_instruction "$link" "$target" "$updatemanifestv3" + make_addsymlink_instruction "$link" "$target" "$updatemanifestv2" "$updatemanifestv3" done # Newly added files

1 0

[tor-browser/tor-browser-31.1.1esr-4.x-1] Bug 13025: Lie about screen orientation.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 58b604e6fc832bf4044c9ab951eba6cf9767ad67 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Oct 7 11:37:12 2014 +0000 Bug 13025: Lie about screen orientation. In a non-chrome context we give 'landscape-primary' back if asked about the screen orientation. --- dom/base/nsScreen.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index 76674da..7b80f8e 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -174,22 +174,26 @@ nsScreen::Notify(const hal::ScreenConfiguration& aConfiguration) void nsScreen::GetMozOrientation(nsString& aOrientation) { - switch (mOrientation) { - case eScreenOrientation_PortraitPrimary: - aOrientation.AssignLiteral("portrait-primary"); - break; - case eScreenOrientation_PortraitSecondary: - aOrientation.AssignLiteral("portrait-secondary"); - break; - case eScreenOrientation_LandscapePrimary: + if (!IsChrome()) { aOrientation.AssignLiteral("landscape-primary"); - break; - case eScreenOrientation_LandscapeSecondary: - aOrientation.AssignLiteral("landscape-secondary"); - break; - case eScreenOrientation_None: - default: - MOZ_CRASH("Unacceptable mOrientation value"); + } else { + switch (mOrientation) { + case eScreenOrientation_PortraitPrimary: + aOrientation.AssignLiteral("portrait-primary"); + break; + case eScreenOrientation_PortraitSecondary: + aOrientation.AssignLiteral("portrait-secondary"); + break; + case eScreenOrientation_LandscapePrimary: + aOrientation.AssignLiteral("landscape-primary"); + break; + case eScreenOrientation_LandscapeSecondary: + aOrientation.AssignLiteral("landscape-secondary"); + break; + case eScreenOrientation_None: + default: + MOZ_CRASH("Unacceptable mOrientation value"); + } } }

1 0

[torbutton/master] Bug 13366: Fix cert exemption dialog when disk storage is enabled.
by mikeperry＠torproject.org 08 Oct '14

08 Oct '14

commit 32cb8c1dc8684b179f954c1299f2fadf564175d7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 8 13:23:39 2014 -0700 Bug 13366: Fix cert exemption dialog when disk storage is enabled. --- src/CHANGELOG | 1 + src/chrome/content/torbutton.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 0d68ab6..44b8999 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -4,6 +4,7 @@ * Bug 13138: ESR31-about:tor shows "Tor is not working" * Bug 12947: Adapt session storage blocker to ESR 31. * Bug 10716: Take care of drag/drop events in ESR 31. + * Bug 13366: Fix cert exemption dialog when disk storage is enabled. 1.6.12.3 23 Sep 2014 diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ca52fa9..ffea83b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1984,6 +1984,8 @@ function torbutton_update_disk_prefs() { m_tb_prefs.setBoolPref("browser.privatebrowsing.autostart", mode); m_tb_prefs.setBoolPref("browser.cache.disk.enable", !mode); + m_tb_prefs.setBoolPref("security.nocertdb", mode); + // No way to clear this beast during New Identity. Leave it off. //m_tb_prefs.setBoolPref("dom.indexedDB.enabled", !mode);

1 0

[tor-browser-bundle/master] Bug 13328: Enabling PIE for ESR 31.
by gk＠torproject.org 06 Oct '14

06 Oct '14

commit fce458344a47b6ef88243b7eb6ff176d39d284d3 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 6 18:31:13 2014 +0000 Bug 13328: Enabling PIE for ESR 31. --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 8f58353..27ba077 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -76,7 +76,9 @@ script: | cd $INSTDIR/gcc/bin cp /usr/bin/hardened-cc ./ mv gcc gcc.real + mv c++ c++.real ln -sf hardened-cc gcc + ln -sf hardened-cc c++ cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH ARCH=""

1 0

[tor-browser-bundle/master] Bug 13329: Enabling stack canaries for ESR 31.
by gk＠torproject.org 06 Oct '14

06 Oct '14

commit e5512159cafecfd2e8b46644ed67506bcac0f97d Author: Georg Koppen <gk(a)torproject.org> Date: Mon Oct 6 09:37:30 2014 +0000 Bug 13329: Enabling stack canaries for ESR 31. --- gitian/descriptors/linux/gitian-firefox.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 5d47b96..8f58353 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -72,6 +72,12 @@ script: | ln -sf ld.gold ld cd ~/build unzip -d $INSTDIR gcc-linux$GBUILD_BITS-utils.zip + # Make sure we use the hardening wrapper when compiling Tor Browser. + cd $INSTDIR/gcc/bin + cp /usr/bin/hardened-cc ./ + mv gcc gcc.real + ln -sf hardened-cc gcc + cd ~/build export PATH=$INSTDIR/gcc/bin:$INSTDIR/binutils/bin:$PATH ARCH="" if [ $GBUILD_BITS == "64" ];

1 0

[tor-browser-bundle/master] Add meek-azure to transports list.
by mikeperry＠torproject.org 04 Oct '14

04 Oct '14

commit 9d57a89e45dfc7ebdb8cf56851b1cd15f13020ea Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Oct 4 16:31:13 2014 -0700 Add meek-azure to transports list. --- Bundle-Data/PTConfigs/bridge_prefs.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index a17a1be..d9c2049 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -32,3 +32,4 @@ pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.21 pref("extensions.torlauncher.default_bridge.meek-google.1", "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-bundle/master] Upgrade go to 1.3.3.
by gk＠torproject.org 03 Oct '14

03 Oct '14

commit 23ce9c9c4ff773a216c2047f814f5b67b8243252 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Oct 2 04:07:17 2014 +0000 Upgrade go to 1.3.3. https://groups.google.com/d/topic/golang-announce/MYS5MkDF5_A https://golang.org/doc/devel/release.html#go1.3 --- gitian/versions | 4 ++-- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- gitian/versions.nightly | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 319a0de..3e5cffa 100755 --- a/gitian/versions +++ b/gitian/versions @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -92,7 +92,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index ccfb542..fe81f52 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=5.0development.0 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -92,7 +92,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index ca9d053..72a1365 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -47,7 +47,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -94,7 +94,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0617ea7..87136d9 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -49,7 +49,7 @@ SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 HTTPSE_VER=5.0development.0 -GO_VER=1.3 +GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -94,7 +94,7 @@ M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 -GO_HASH=eb983e6c5b2b9838f482c5442b1ac1856f610f2b21f3c123b3fedb48ffc35382 +GO_HASH=1bb6fde89cfe8b9756a875af55d994cce0994861227b5dc0f268c143d91cd5ff ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}

1 0

[tor-browser-bundle/master] Update FTE bridges, add IPv6 bridges.
by mikeperry＠torproject.org 02 Oct '14

02 Oct '14

commit 91c19fd898d25ba10d4531b91eb1591a08f1779c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Oct 1 20:19:52 2014 -0700 Update FTE bridges, add IPv6 bridges. --- Bundle-Data/PTConfigs/bridge_prefs.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index b04e84e..a17a1be 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -16,14 +16,15 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3 pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); -// <ipv4> -pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80 6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89"); -pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); -pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); -pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); -pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); -pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -// </ipv4> +pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 50.7.176.114:80 2BD466989944867075E872310EBAD65BC88C8AEF"); +pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); +pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.161:8080 1E326AAFB3FCB515015250D8FCCC8E37F91A153B"); +pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.162:8080 FC562097E1951DCC41B7D7F324D88157119BB56D"); +pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); + +pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte [2001:49f0:d002:1::2]:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E"); +pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte [2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF"); pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");

1 0