- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Adding gk's key for verifying tags, too.
by gk＠torproject.org 01 Dec '14

01 Dec '14

commit 08a199b9e868d02caff80a06f591d1a116f40483 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 1 09:18:32 2014 +0000 Adding gk's key for verifying tags, too. --- gitian/gpg/torbutton.gpg | Bin 15716 -> 44645 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index 7f14ee3..ebc37d7 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-4.0] Adding gk's key for verifying tags, too.
by gk＠torproject.org 01 Dec '14

01 Dec '14

commit 8e37ce5fba29567a91dc9d79b44187a4e400b8cf Author: Georg Koppen <gk(a)torproject.org> Date: Mon Dec 1 09:16:59 2014 +0000 Adding gk's key for verifying tags, too. --- gitian/gpg/torbutton.gpg | Bin 15716 -> 44645 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index 7f14ee3..ebc37d7 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor-browser-bundle/maint-4.0] Leave the custom POODLE fix in.
by gk＠torproject.org 29 Nov '14

29 Nov '14

commit a5d9326573df0960c7b9184dd172a23d5476e1a6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 29 08:40:32 2014 +0000 Leave the custom POODLE fix in. --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 50f7974..93d20d7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -9,7 +9,6 @@ Tor Browser 4.0.2 -- Dec 2 2014 * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Bug 5926: Prevent JS engine locale leaks (by setting the C library locale) * Bug 13504: Remove unreliable/unreachable non-public bridges - * Bug 13435: Remove our custom POODLE fix * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. * Bug 13558: Fix crash on Windows XP during download folder changing

1 0

[tor-browser-bundle/maint-4.0] We are going with a build1.
by gk＠torproject.org 29 Nov '14

29 Nov '14

commit 97f1899c10ab8cf0e59f91f951da5bbc934833a5 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Nov 29 08:34:49 2014 +0000 We are going with a build1. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 6f9d97b..ad8fd74 100755 --- a/gitian/versions +++ b/gitian/versions @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.2

1 0

[tor-browser-bundle/maint-4.0] Updated config.yml for 4.0.2
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit 6ea30dc92d1d4682706ad88971f324a6383434b7 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 28 12:53:13 2014 +0000 Updated config.yml for 4.0.2 --- tools/update-responses/config.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 2132373..bdecdec 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -4,20 +4,27 @@ build_targets: linux64: Linux_x86_64-gcc3 win32: WINNT_x86-gcc3 osx32: Darwin_x86-gcc3 + osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.1 - alpha: 4.0.1 + release: 4.0.2 + alpha: 4.5-alpha-1 versions: - 4.0: - platformVersion: 31.2.0 + 4.0.2: + platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0 - 4.0.1: + download_url: https://www.torproject.org/dist/torbrowser/4.0.2 + incremental_from: + - 4.0 + - 4.0.1 + 4.5-alpha-1: platformVersion: 31.2.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.1 + download_url: https://www.torproject.org/dist/torbrowser/4.5-alpha-1 incremental_from: - 4.0 -# osx32: -# minSupportedOSVersion: 10.7 -# unsupported: 1 + - 4.0.1 + migrate_archs: + osx32: osx64 + osx32: + minSupportedOSVersion: 10.8 + detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#upda…

1 0

[tor-browser-bundle/maint-4.0] update_responses: add support for arch migration
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit c17dc8aa81fb10d27dc1b9a8c3ca4116414cccfa Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Nov 6 23:07:16 2014 +0100 update_responses: add support for arch migration --- tools/update-responses/update_responses | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index a42e700..c788586 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -219,6 +219,14 @@ sub write_responses { get_version_files($config, $version); create_missing_incremental_mars($config, $version); my $files = $config->{versions}{$version}{files}; + my $migrate_archs = $config->{versions}{$version}{migrate_archs} // {}; + foreach my $old_os (keys %$migrate_archs) { + my $new_os = $migrate_archs->{$old_os}; + foreach my $lang (keys %{$files->{$new_os}}) { + $files->{$old_os}{$lang}{complete} = + $files->{$new_os}{$lang}{complete}; + } + } foreach my $os (keys %$files) { foreach my $lang (keys %{$files->{$os}}) { my $resp = get_response($config, $version, $os,

1 0

[tor-browser-bundle/maint-4.0] Merge branch 'isis/bug13504' into maint-4.0
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit 8704443fa6f3c9ff7c971f8ea8b1e215f11fae35 Merge: 44e03fe d54502b Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 28 09:37:50 2014 +0000 Merge branch 'isis/bug13504' into maint-4.0 Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)

1 0

[tor-browser-bundle/maint-4.0] Remove default obfs3 bridges #4 and #5, and scramblesuit bridge #1.
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit d54502befc3bffef55541e9db18e3428d548cde1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Oct 21 20:36:40 2014 +0000 Remove default obfs3 bridges #4 and #5, and scramblesuit bridge #1. These bridges were removed because: 1. They have never provided their bridge descriptors for metrics. See #13504: https://bugs.torproject.org/13504 2. They are either unreachable or unreliable. 2.a. The two obfs3 bridges are unreachable: Oct 21 20:25:53.000 [warn] Proxy Client: unable to connect to 209.141.36.236:45496 ("TTL expired") Oct 21 20:25:53.000 [warn] Proxy Client: unable to connect to 208.79.90.242:35658 ("TTL expired") 2.b. The scramblesuit bridge is rejecting connections: Oct 21 20:26:57.000 [warn] Proxy Client: unable to connect to 188.40.121.112:39707 ("Connection refused") * REMOVE default bridges obfs3.4, obfs3.5, and scramblesuit.1. * RENAME other bridges' preference names to keep the lists sequential. * FIXES part of #13504, sort of kind of. We still don't have historical metrics for these bridges for the period they were active. --- Bundle-Data/PTConfigs/bridge_prefs.js | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index d9c2049..20ec235 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -5,10 +5,8 @@ pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:80 A09D536DD1752D542E1FBB3C9CE4449D51298239"); pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); -pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); @@ -26,9 +24,8 @@ pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080 A1 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"); -pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); +pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); +pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); 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");

1 0

[tor-browser-bundle/maint-4.0] Bumped HTTPS-E; updated changelog/versions.
by gk＠torproject.org 28 Nov '14

28 Nov '14

commit ee0f34c497292135a0cd05a7791444fc324d44f5 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 28 10:33:31 2014 +0000 Bumped HTTPS-E; updated changelog/versions. --- Bundle-Data/Docs/ChangeLog.txt | 4 +++- gitian/versions | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 65c0493..50f7974 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,17 +2,19 @@ Tor Browser 4.0.2 -- Dec 2 2014 * All Platforms * Update Firefox to 31.3.0esr * Update NoScript to 2.6.9.5 + * Update HTTPS Everywhere to 4.0.2 * Update Torbutton to 1.7.0.2 * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Bug 5926: Prevent JS engine locale leaks (by setting the C library locale) + * Bug 13504: Remove unreliable/unreachable non-public bridges + * Bug 13435: Remove our custom POODLE fix * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. * Bug 13558: Fix crash on Windows XP during download folder changing * Bug 13594: Fix update failure for Windows XP users - Tor Browser 4.0.1 -- Oct 30 2014 * All Platforms * Update Tor to 0.2.5.10 diff --git a/gitian/versions b/gitian/versions index 31677e1..6f9d97b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.1 +TORBROWSER_VERSION=4.0.2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -8,7 +8,7 @@ FIREFOX_VERSION=31.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.2 @@ -47,7 +47,7 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.1 +HTTPSE_VER=4.0.2 GO_VER=1.3.3 ## File names for the source packages @@ -82,7 +82,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a -HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe +HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

1 0

[tor-browser-bundle/maint-4.0] FF 31.3.0esr required a build2.
by mikeperry＠torproject.org 28 Nov '14

28 Nov '14

commit 44e03fe25388e72a1ea6b05a99ba7d4d67dc6ad2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 26 17:20:55 2014 -0800 FF 31.3.0esr required a build2. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 84aa7f6..31677e1 100755 --- a/gitian/versions +++ b/gitian/versions @@ -33,7 +33,7 @@ GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=4.9.1 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/maint-4.0] Update changelog for 4.0.2.
by mikeperry＠torproject.org 28 Nov '14

28 Nov '14

commit 46f79d33d5b410122673ecbd4cea47f7a204b941 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 26 16:49:09 2014 -0800 Update changelog for 4.0.2. --- Bundle-Data/Docs/ChangeLog.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b99e049..65c0493 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,18 @@ +Tor Browser 4.0.2 -- Dec 2 2014 + * All Platforms + * Update Firefox to 31.3.0esr + * Update NoScript to 2.6.9.5 + * Update Torbutton to 1.7.0.2 + * Bug 13019: Synchronize locale spoofing pref with our Firefox patch + * Bug 13746: Properly link Torbutton UI to thirdparty pref. + * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode + * Bug 5926: Prevent JS engine locale leaks (by setting the C library locale) + * Windows + * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. + * Bug 13558: Fix crash on Windows XP during download folder changing + * Bug 13594: Fix update failure for Windows XP users + + Tor Browser 4.0.1 -- Oct 30 2014 * All Platforms * Update Tor to 0.2.5.10

1 0

[tor-browser-bundle/maint-4.0] Update versions for Firefox, Torbutton, Noscript, and MinGW.
by mikeperry＠torproject.org 28 Nov '14

28 Nov '14

commit edc4338f5e61605a3170165745cb37daaa944ffc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Nov 25 16:39:27 2014 -0800 Update versions for Firefox, Torbutton, Noscript, and MinGW. --- gitian/versions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions b/gitian/versions index b6ec79f..84aa7f6 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,19 +4,19 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=31.2.0esr +FIREFOX_VERSION=31.3.0esr TORBROWSER_UPDATE_CHANNEL=release -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.7.0.1 +TORBUTTON_TAG=1.7.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable -MINGW_TAG=469ed5d227202b373409c8a3b4c1358be39b9983 # XXX: ??? +MINGW_TAG=e712bb8b106d059914388e6ccd93c584a6416082 # XXX: Bug #13443 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.12 FLASHPROXY_TAG=1.6 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## 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.6.9.3-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.5-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a +NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Fix typo in gmp library name
by gk＠torproject.org 21 Nov '14

21 Nov '14

commit 3f486db138dbf8d8361ca7a86ebecce00a55aa8c Author: Georg Koppen <gk(a)torproject.org> Date: Fri Nov 21 16:26:29 2014 +0000 Fix typo in gmp library name --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 02a5c5f..e79e8af 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -74,8 +74,8 @@ script: | unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip - # FTE only needs libgmp.10.so and no libgmpxx anymore. - cp $INSTDIR/gmp/lib/libgmp.10.so $INSTDIR/Tor + # FTE only needs libgmp.so.10 and no libgmpxx anymore. + cp $INSTDIR/gmp/lib/libgmp.so.10 $INSTDIR/Tor # Building go # http://golang.org/doc/install/source#environment

1 0

[tor-browser-bundle/master] It's "libgmp.10.so" and not "libgmp-10.so"!
by gk＠torproject.org 20 Nov '14

20 Nov '14

commit 1ef0e4be4907f71d79ba19778b42de8dd7a2610a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 20 13:44:35 2014 +0000 It's "libgmp.10.so" and not "libgmp-10.so"! --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 6c5d742..02a5c5f 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -74,8 +74,8 @@ script: | unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip - # FTE only needs libgmp-10.so and no libgmpxx anymore. - cp $INSTDIR/gmp/lib/libgmp-10.so $INSTDIR/Tor + # FTE only needs libgmp.10.so and no libgmpxx anymore. + cp $INSTDIR/gmp/lib/libgmp.10.so $INSTDIR/Tor # Building go # http://golang.org/doc/install/source#environment

1 0

[tor-browser-bundle/master] Bug 12238: Make Linux bundles reproducible on LXC.
by gk＠torproject.org 19 Nov '14

19 Nov '14

commit 2d063903ba6fac309ee367fe397bc53c972c29cc Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 19 14:27:02 2014 +0000 Bug 12238: Make Linux bundles reproducible on LXC. Thanks to the investigation and this fix, Lunar. --- gitian/descriptors/linux/gitian-utils.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 8a41c5a..0646401 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -128,7 +128,9 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. - ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + # --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 install cd ..

1 0

[tor-browser-bundle/master] Bug 13588: Ship only libgmp?10.* for FTE.
by gk＠torproject.org 19 Nov '14

19 Nov '14

commit b6be76ce511a9346d3cd7f12c998095ee58a1da8 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 19 14:16:27 2014 +0000 Bug 13588: Ship only libgmp?10.* for FTE. FTE seems to not need libgmpxx anymore. Additionally, we don't need multiple copies of libgmp either. We remove all these unnecessary libraries to save space and reduce complexity. Bug 13055 gets fixed by this commit as well. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 3 ++- gitian/descriptors/linux/gitian-utils.yml | 2 ++ gitian/descriptors/mac/gitian-pluggable-transports.yml | 3 ++- gitian/descriptors/mac/gitian-utils.yml | 2 ++ gitian/descriptors/windows/gitian-pluggable-transports.yml | 5 +++-- gitian/descriptors/windows/gitian-utils.yml | 2 ++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index daa1225..6c5d742 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -74,7 +74,8 @@ script: | unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip - cp $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor + # FTE only needs libgmp-10.so and no libgmpxx anymore. + cp $INSTDIR/gmp/lib/libgmp-10.so $INSTDIR/Tor # Building go # http://golang.org/doc/install/source#environment diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 0c5e38c..8a41c5a 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -126,6 +126,8 @@ script: | tar xjf gmp.tar.bz2 cd gmp-* find -type f | xargs touch --date="$REFERENCE_DATETIME" + # Even if we are not shipping libgmpxx anymore we still need --enable-xcc + # during compile time. ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx make make install diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 6201230..0931c59 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -71,7 +71,8 @@ script: | export PATH="$PATH:$HOME/build/apple-osx/bin/" unzip -d $INSTDIR gmp-mac64-utils.zip unzip -d $INSTDIR openssl-mac64-utils.zip - cp $INSTDIR/gmp/lib/*dylib* $TBDIR/Tor/ + # FTE only needs libgmp.10.dylib and no libgmpxx anymore. + cp $INSTDIR/gmp/lib/libgmp.10.dylib $TBDIR/Tor/ # export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index f96b5ec..6729eeb 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -67,6 +67,8 @@ script: | tar xjf gmp.tar.bz2 cd gmp-* find -type f | xargs touch --date="$REFERENCE_DATETIME" + # Even if we are not shipping libgmpxx anymore we still need --enable-xcc + # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx make make install diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index bd3189b..70d4b91 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -88,7 +88,8 @@ script: | unzip -d $INSTDIR gmp-win32-utils.zip unzip -d $INSTDIR openssl-win32-utils.zip unzip -d $INSTDIR gcclibs-win32-utils.zip - cp $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor + # FTE only needs libgmp-10.dll and no libgmpxx anymore. + cp $INSTDIR/gmp/bin/libgmp-10.dll $INSTDIR/Tor export PATH=$INSTDIR/mingw-w64/bin:$PATH @@ -281,7 +282,7 @@ script: | # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp - cp -a $INSTDIR/gmp/bin/libgmp-*.dll . + cp -a $INSTDIR/gmp/bin/libgmp-10.dll . find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= WINDOWS_BUILD=1 CROSS_COMPILE=1 PYTHON=$INSTPYTHON make LD_PRELOAD= $INSTPYTHON setup.py install diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index f0deca0..7846e59 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -141,6 +141,8 @@ script: | tar xjf gmp.tar.bz2 cd gmp-* find -type f | xargs touch --date="$REFERENCE_DATETIME" + # Even if we are not shipping libgmpxx anymore we still need --enable-xcc + # during compile time. ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared make make install

1 0

[tor-browser-bundle/master] Delete unused patches in tor descriptors.
by gk＠torproject.org 19 Nov '14

19 Nov '14

commit 7339dbe1fb82e3c87ef5d3ad329c52edae80aac1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 19 13:20:40 2014 +0000 Delete unused patches in tor descriptors. --- gitian/descriptors/linux/gitian-tor.yml | 7 ------- gitian/descriptors/mac/gitian-tor.yml | 7 ------- gitian/descriptors/windows/gitian-tor.yml | 7 ------- 3 files changed, 21 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 68a5bae..f9795ea 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -19,13 +19,6 @@ remotes: "dir": "tor" files: - "versions" -- "bug10297.patch" -- "bug5018.patch" -- "bug11156.patch" -- "bug11200.patch" -- "bug11069.patch" -- "bug9665.patch" -- "bug8402.patch" - "bug8402-master.patch" - "bug8405.patch" - "dzip.sh" diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 5754d77..9cedf67 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -15,13 +15,6 @@ remotes: "dir": "tor" files: - "versions" -- "bug10297.patch" -- "bug5018.patch" -- "bug11156.patch" -- "bug11200.patch" -- "bug11069.patch" -- "bug9665.patch" -- "bug8402.patch" - "bug8402-master.patch" - "bug8405.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 6be93b5..dce98f8 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -15,13 +15,6 @@ remotes: "dir": "tor" files: - "versions" -- "bug10297.patch" -- "bug5018.patch" -- "bug11156.patch" -- "bug11200.patch" -- "bug11069.patch" -- "bug9665.patch" -- "bug8402.patch" - "bug8402-master.patch" - "bug8405.patch" - "binutils.tar.bz2"

1 0

[tor-browser-bundle/master] Combine Torbutton cache isolation changelog entries.
by mikeperry＠torproject.org 16 Nov '14

16 Nov '14

commit 0463c2d4b1165a5d820c88779039e014a2c5218e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Nov 16 12:44:05 2014 -0800 Combine Torbutton cache isolation changelog entries. --- Bundle-Data/Docs/ChangeLog.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index d6926c7..f226adc 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,9 +17,8 @@ Tor Browser 4.5-alpha-1 -- Nov 14 2014 * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs * Bug 13651: Prevent circuit-status related UI hang. * Bug 13666: Various circuit status UI fixes - * Bug 13742: Remove cache isolation code in favor of direct C++ patch + * Bugs 13742+13751: Remove cache isolation code in favor of direct C++ patch * Bug 13746: Properly update third party isolation pref if disabled from UI - * Bug 13751: Get rid of remaining SafeCache parts * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Bug 12903: Include obfs4proxy pluggable transport * Windows

1 0

[torbutton/master] Update translations.
by mikeperry＠torproject.org 16 Nov '14

16 Nov '14

commit 2f78acaa99141e2de70641b46ebf8693cb9f50a0 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Nov 16 12:37:10 2014 -0800 Update translations. --- src/chrome/locale/sv/torbutton.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/locale/sv/torbutton.dtd b/src/chrome/locale/sv/torbutton.dtd index 645b61d..d88a10c 100644 --- a/src/chrome/locale/sv/torbutton.dtd +++ b/src/chrome/locale/sv/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Klicka för att installera Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Integritet- och säkerhetsinställningar"> <!ENTITY torbutton.prefs.block_thread "Blockera läsning av historik medan Tor är aktiverat (kritiskt)"> <!ENTITY torbutton.prefs.block_thwrite "Blockera lagring av historik medan Tor är aktiverat (rekommenderat)"> <!ENTITY torbutton.prefs.block_nthread "Blockera läsning av historik medan Tor är inaktiverat (valfritt)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Begränsa tredjepartskakor och annan tracking data"> <!ENTITY torbutton.prefs.block_plugins "Inaktivera insticksmoduler (så som Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Ändra detailjer som utmärker dig ifrån andra Tor Browser användare"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Säkerhetsnivå"> +<!ENTITY torbutton.prefs.sec_low "Låg (förvald)"> +<!ENTITY torbutton.prefs.sec_med_low "Medium-låg"> +<!ENTITY torbutton.prefs.sec_med_high "Medium-hög"> +<!ENTITY torbutton.prefs.sec_high "Hög"> +<!ENTITY torbutton.prefs.sec_custom "Anpassad nivå">

1 0

[torbutton/master] Bug 13751: Get rid of remaining SafeCache parts.
by mikeperry＠torproject.org 16 Nov '14

16 Nov '14

commit e2cce93493a857b062af83f5e8f9130fb76933a0 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 13 13:30:05 2014 +0000 Bug 13751: Get rid of remaining SafeCache parts. Additionally to getting rid of remaining SageCache parts we bump the Torbutton version to 1.8.1.1 and adapt the CHANGELOG. --- src/CHANGELOG | 3 +++ src/chrome/content/torbutton.js | 6 ------ src/install.rdf | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 4510b0c..1966ab7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +1.8.1.1 + * Bug 13751: Get rid of remaining SafeCache parts + 1.8.1.0 * Bug 13746: Properly link Torbutton UI to thirdparty pref. * Bug 13742: Remove SafeCache code (in favor of C++ implementation) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 841dca8..2e921da 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2689,9 +2689,6 @@ function torbutton_do_main_window_startup() torbutton_unique_pref_observer.register(); - // Bug 1506: This is probably the most important observer in this function - // XXX: We should fold this into our code/move it to its own component - SSC_startup(); } // Bug 1506 P4: Most of this function is now useless, save @@ -2957,9 +2954,6 @@ function torbutton_close_window(event) { progress.removeProgressListener(torbutton_weblistener); torbutton_unique_pref_observer.unregister(); - // XXX: We should fold this into our code.. - SSC_controller.removeListener(); - if(m_tb_is_main_window) { // main window not reset above // This happens on Mac OS because they allow firefox // to still persist without a navigator window diff --git a/src/install.rdf b/src/install.rdf index 402b99c..b39f0de 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.0</em:version> + <em:version>1.8.1.1</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Update changelog and version file (due to #13751).
by gk＠torproject.org 13 Nov '14

13 Nov '14

commit 34f463f774ead19040933b640495cd9f875c8eb5 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Nov 13 13:49:50 2014 +0000 Update changelog and version file (due to #13751). --- Bundle-Data/Docs/ChangeLog.txt | 6 ++++-- gitian/versions.alpha | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c8fac5c..d6926c7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -10,7 +10,7 @@ Tor Browser 4.5-alpha-1 -- Nov 14 2014 * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Update Tor to 0.2.6.1-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.1.0 + * Update Torbutton to 1.8.1.1 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain @@ -19,10 +19,12 @@ Tor Browser 4.5-alpha-1 -- Nov 14 2014 * Bug 13666: Various circuit status UI fixes * Bug 13742: Remove cache isolation code in favor of direct C++ patch * Bug 13746: Properly update third party isolation pref if disabled from UI + * Bug 13751: Get rid of remaining SafeCache parts * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). - * Include obfs4proxy pluggable transport + * Bug 12903: Include obfs4proxy pluggable transport * Windows * Bug 13443: Re-enable DirectShow; fix crash with mingw patch. + * Bug 13558: Fix crash on Windows XP during download folder changing * Bug 13091: Make app name "Tor Browser" instead of "Tor" * Bug 13594: Fix update failure for Windows XP users * Mac diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 953cebb..edb59c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ TORBROWSER_UPDATE_CHANNEL=alpha TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build6 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.1.0 +TORBUTTON_TAG=1.8.1.1 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[tor-browser-bundle/master] Update changelog and versions file for bugs 13742 and 13746.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 09b07baa2238ca581c2526f002ad2fcc133d4b3f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 20:15:32 2014 -0800 Update changelog and versions file for bugs 13742 and 13746. --- Bundle-Data/Docs/ChangeLog.txt | 7 +++++-- gitian/versions.alpha | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 988b4cd..c8fac5c 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 4.5-alpha-1 -- Nov 13 2014 +Tor Browser 4.5-alpha-1 -- Nov 14 2014 * All Platforms * Bug 3455: Patch Firefox SOCKS and proxy filters to allow user+pass isolation * Bug 11955: Backport HTTPS Certificate Pinning patches from Firefox 32 @@ -7,15 +7,18 @@ Tor Browser 4.5-alpha-1 -- Nov 13 2014 * Bug 13301: Prevent extensions incompatibility error after upgrades * Bug 13460: Fix MSVC compilation issue * Bug 13504: Remove stale bridges from default bridge set + * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode * Update Tor to 0.2.6.1-alpha * Update NoScript to 2.6.9.3 - * Update Torbutton to 1.8.0.3 + * Update Torbutton to 1.8.1.0 * Bug 9387: Provide a "Security Slider" for vulnerability surface reduction * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 3455: Use SOCKS user+pass to isolate all requests from the same url domain * Bug 8641: Create browser UI to indicate current tab's Tor circuit IPs * Bug 13651: Prevent circuit-status related UI hang. * Bug 13666: Various circuit status UI fixes + * Bug 13742: Remove cache isolation code in favor of direct C++ patch + * Bug 13746: Properly update third party isolation pref if disabled from UI * Bug 13586: Make meek use TLS session tickets (to look like stock Firefox). * Include obfs4proxy pluggable transport * Windows diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 1c4227f..953cebb 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -8,10 +8,10 @@ FIREFOX_VERSION=31.2.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build5 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build6 TOR_TAG=tor-0.2.6.1-alpha TORLAUNCHER_TAG=0.2.7.0.1 -TORBUTTON_TAG=1.8.0.3 +TORBUTTON_TAG=1.8.1.0 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8

1 0

[torbutton/master] Changelog and version bump for 1.8.1.0.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit c711366237e8838e0c00974a5385d17551203c2b Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 19:42:49 2014 -0800 Changelog and version bump for 1.8.1.0. --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 53bb7c7..4510b0c 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +1.8.1.0 + * Bug 13746: Properly link Torbutton UI to thirdparty pref. + * Bug 13742: Remove SafeCache code (in favor of C++ implementation) + 1.8.0.3 * misc: Translation imports for security slider diff --git a/src/install.rdf b/src/install.rdf index febbd6e..402b99c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.0.3</em:version> + <em:version>1.8.1.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Update translations.
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 952518c2f1ef29bbad191523ab9ae7a8204ba18f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 19:44:54 2014 -0800 Update translations. --- src/chrome/locale/it/torbutton.dtd | 14 +++++++------- src/chrome/locale/pt/torbutton.dtd | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chrome/locale/it/torbutton.dtd b/src/chrome/locale/it/torbutton.dtd index c8a0669..11741a7 100644 --- a/src/chrome/locale/it/torbutton.dtd +++ b/src/chrome/locale/it/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Fai clic per inizializzare Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Impostazioni di Privacy e Sicurezza"> <!ENTITY torbutton.prefs.block_thread "Blocca la lettura della cronologia durante l'uso di Tor (essenziale)"> <!ENTITY torbutton.prefs.block_thwrite "Blocca la scrittura della cronologia durante l'uso di Tor (consigliato)"> <!ENTITY torbutton.prefs.block_nthread "Blocca la lettura della cronologia quando non si usa Tor (facoltativo)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limita i cookie di terze parti e altri dati di tracciamento"> <!ENTITY torbutton.prefs.block_plugins "Disabilita i plugin del browser (come Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Cambia i dettagli che ti distinguono dagli altri utenti di Tor Browser"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Livello di Sicurezza"> +<!ENTITY torbutton.prefs.sec_low "Basso (default)"> +<!ENTITY torbutton.prefs.sec_med_low "Medio-Basso"> +<!ENTITY torbutton.prefs.sec_med_high "Medio-Alto"> +<!ENTITY torbutton.prefs.sec_high "Alto"> +<!ENTITY torbutton.prefs.sec_custom "Valori Customizzabili"> diff --git a/src/chrome/locale/pt/torbutton.dtd b/src/chrome/locale/pt/torbutton.dtd index c7388a2..d2b83a9 100644 --- a/src/chrome/locale/pt/torbutton.dtd +++ b/src/chrome/locale/pt/torbutton.dtd @@ -44,7 +44,7 @@ <!ENTITY torbutton.context_menu.openTorWindow.key "d"> <!ENTITY torbutton.button.label "Torbutton"> <!ENTITY torbutton.button.tooltip "Clique para iniciar o Torbutton"> -<!ENTITY torbutton.prefs.privacy_security_settings "Privacy and Security Settings"> +<!ENTITY torbutton.prefs.privacy_security_settings "Privacidade e Definições de Segurança"> <!ENTITY torbutton.prefs.block_thread "Bloquear leitura do histórico durante a utilização do Tor (crucial)"> <!ENTITY torbutton.prefs.block_thwrite "Bloquear escrita no histórico durante a utilização do Tor (recomendado)"> <!ENTITY torbutton.prefs.block_nthread "Bloquear leitura do histórico durante a não utilização do Tor (opcional)"> @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data"> <!ENTITY torbutton.prefs.block_plugins "Desabilitar plugins (como o Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_low "Low (default)"> -<!ENTITY torbutton.prefs.sec_med_low "Medium-Low"> -<!ENTITY torbutton.prefs.sec_med_high "Medium-High"> -<!ENTITY torbutton.prefs.sec_high "High"> -<!ENTITY torbutton.prefs.sec_custom "Custom Values"> +<!ENTITY torbutton.prefs.sec_caption "Nível de Segurança"> +<!ENTITY torbutton.prefs.sec_low "Baixo (pré-definido)"> +<!ENTITY torbutton.prefs.sec_med_low "Médio-Baixo"> +<!ENTITY torbutton.prefs.sec_med_high "Médio-Alto"> +<!ENTITY torbutton.prefs.sec_high "Alto"> +<!ENTITY torbutton.prefs.sec_custom "Valores definidos">

1 0

[torbutton/master] Bug 13742: Remove SafeCache code (in favor of C++ implementation)
by mikeperry＠torproject.org 13 Nov '14

13 Nov '14

commit 1dedacb01855cab10835d165578575603a208cec Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 12 19:38:37 2014 -0800 Bug 13742: Remove SafeCache code (in favor of C++ implementation) --- src/chrome/content/stanford-safecache.js | 448 ------------------------------ src/chrome/content/torbutton.xul | 4 - 2 files changed, 452 deletions(-) diff --git a/src/chrome/content/stanford-safecache.js b/src/chrome/content/stanford-safecache.js deleted file mode 100644 index 0ef52ad..0000000 --- a/src/chrome/content/stanford-safecache.js +++ /dev/null @@ -1,448 +0,0 @@ -// Bug 1506 P3: This file provides important cache isolation properties, -// but it is not very useful without a patched Firefox to go with it. -// It could probably also use some refactoring into an XPCOM component. -// It is currently registered from torbutton.js's "main window" observers, -// which is not the right place. - -/* - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Stanford University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// Dual-keyed cache/cookie same-origin policy -// Ensures that cache and cookies set in HTTP headers cannot be used for -// non-cooperative or semi-cooperative tracking. -// -// Author: Edward Pastuszenski -// -// Based on Stanford SafeCache -// Author: Collin Jackson -// Other contributors: Andrew Bortz, John Mitchell, Dan Boneh -// - -////////////////////////////////////////////////////////////////////////////// -// Constants - -const kSSC_ENABLED_PREF = "extensions.torbutton.safecache"; -const kSSC_SC_ENABLED_PREF = "extensions.torbutton.dual_key_cookies"; -const kSSC_TORBUTTON_PREF = "extensions.torbutton.tor_enabled"; -const kSSC_COOKIE_JS_PREF = "extensions.torbutton.cookie_js_allow"; - -//////////////////////////////////////////////////////////////////////////// -// Debug stuff - -/** - * Dump information to the console? - */ -var SSC_debug = true; - -/** - * Sends data to the console if we're in debug mode - * @param msg The string containing the message to display - */ -function SSC_dump(msg) { - if (SSC_debug) - torbutton_log(3, "SSC: " + msg); -} - -//////////////////////////////////////////////////////////////////////////// -// "Major" objects/classes - -/** - * SafeCache HTTP Request Listener - * Watches for the authentication requests and presents password dialog - */ - -function SSC_RequestListener(controller) { - this.controller = controller; - this.thirdPartyUtil = Cc["@mozilla.org/thirdpartyutil;1"]. - getService(Ci.mozIThirdPartyUtil); - this.cookie_permissions = Cc["@mozilla.org/cookie/permission;1"]. - getService(Ci.nsICookiePermission); -} - -SSC_RequestListener.prototype = -{ - controller: null, // The SSC_Controller that created this - - observe: function(subject, topic, data) { - try { - if(this.controller.getEnabled() == 2) return; - if(this.controller.getEnabled() == 1 - && !this.controller.getTorButton()) return; - if (topic == 'http-on-modify-request') { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); - this.onModifyRequest(subject); - } else if (topic == 'http-on-examine-response') { - subject.QueryInterface(Components.interfaces.nsIHttpChannel); - subject.QueryInterface(Components.interfaces.nsIHttpChannelInternal); - subject.QueryInterface(Components.interfaces.nsICachingChannel); - subject.QueryInterface(Components.interfaces.nsIChannel); - this.onExamineResponse(subject); - } - } catch(e) {try {torbutton_log(4, "SSC: "+e);} catch(ex) {}} - }, - - bypassCache: function(channel) { - channel.loadFlags |= channel.LOAD_BYPASS_CACHE; - // INHIBIT_PERSISTENT_CACHING instead? - channel.cacheKey = this.newCacheKey(0); - SSC_dump("Bypassed cache for " + channel.URI.spec); - }, - - setCacheKey: function(channel, str) { - try { - channel.cacheDomain = str; - SSC_dump("Set cacheDomain to "+str+" for "+channel.URI.spec); - } catch(e) { - var oldData = this.readCacheKey(channel); - var newKey = this.newCacheKey(this.getHash(str) + oldData); - channel.cacheKey = newKey; - SSC_dump("Set cache key to hash(" + str + ") = " + - newKey.data + " for " + channel.URI.spec); - } - }, - - onModifyRequest: function(channel) { - var parent_host = null; - var parent_spec = null; - if (channel.notificationCallbacks || - channel.loadGroup && channel.loadGroup.notificationCallbacks) { - var callbacks = null; - if (channel.notificationCallbacks) { - callbacks = channel.notificationCallbacks; - } else { - callbacks = channel.loadGroup.notificationCallbacks; - } - try { - var wind = callbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - parent_host = wind.window.top.location.hostname; - parent_spec = wind.window.top.location.href; - } catch(e) { - } - SSC_dump("Parent "+parent_host+" for "+ channel.URI.spec); - } - - if (channel.documentURI && channel.documentURI == channel.URI) { - parent_host = null; // first party interaction - parent_spec = null; - } else if(!parent_host) { - // Questionable first party interaction.. - try { - var anuri = null; - try { - anuri = this.thirdPartyUtil.getFirstPartyURIFromChannel(channel, false); - } catch (e) { - torbutton_safelog(2, "FirstParty API failed to get parent: "+e+" ", channel.URI.spec); - // We are not using the TBB based on ESR 24. Falling back to the old - // method. - anuri = this.cookie_permissions.getOriginatingURI(channel); - } - parent_host = anuri.host; - parent_spec = anuri.spec; - } catch(e) { - // XXX: This can still fail for OCSP and other windowless requests.. - torbutton_safelog(3, "Cookie API failed to get parent: "+e+" ",channel.URI.spec); - if (!channel.referrer) { - torbutton_safelog(3, "SSC: No cache isolation parent for ", channel.URI.spec); - } else { - parent_host = channel.referrer.host; - parent_spec = channel.referrer.spec; - } - } - } - - // Same-origin policy - var referrer; - if (parent_host && parent_host != channel.URI.host) { - SSC_dump("Segmenting " + channel.URI.spec + - " content loaded by " + parent_host); - this.setCacheKey(channel, parent_host); - referrer = parent_host; - try { - // Disable 3rd party http auth, but exempt the browser (for favicon loads) - // FIXME: Hrmm, this is just going to disable auth for 3rd party domains. - // It would be better if we could isolate the auth, but still - // allow it to be transmitted.. But I guess, who still uses http auth anyways? - if (channel.getRequestHeader("Authorization") !== null) { - if (parent_spec == "chrome://browser/content/browser.xul") { - torbutton_log(3, "Allowing auth for browser load of "+channel.URI.spec); - } else { - torbutton_safelog(4, "Removing 3rd party HTTP auth for url ", - channel.URI.spec+", parent: "+parent_spec); - channel.setRequestHeader("Authorization", null, false); - channel.setRequestHeader("Pragma", null, false); - channel.setRequestHeader("Cache-Control", null, false); - } - } - } catch (e) {} - } else { - referrer = channel.URI.host; - if(!this.readCacheKey(channel)) { - this.setCacheKey(channel, channel.URI.host); - } else { - SSC_dump("Existing cache key detected; leaving it unchanged."); - } - } - - if (this.controller.getBlockThirdPartyCache()) { - if(parent_host && parent_host != channel.URI.host) { - //SSC_dump("Third party cache blocked for " + channel.URI.spec + - //" content loaded by " + parent_host); - this.bypassCache(channel); - } - } - - var cookie = null; - if (this.controller.getSafeCookieEnabled()) { - try{ - cookie = channel.getRequestHeader("Cookie"); - //SSC_dump("Cookie: " + cookie); - } catch(e) {cookie = null;} - } - - if(cookie) { - //Strip the secondary key from every referrer-matched cookie - var newHeader = ""; - var i = 0; - var lastStart = 0; - //State 0: no information on next cookie - //State 1: cookie will be sent. - //State 2: cookie will not be sent. - var state = 0; - while (i < cookie.length) { - //Dual-keyed cookie - if(state == 0 && cookie.charAt(i) == '|'){ - //If referrers match, strip key and send cookie - var cookieReferrer = cookie.toString().substr(lastStart, i - lastStart); - if (referrer == cookieReferrer){ - lastStart = i+1; - state = 1; - } else { - state = 2; - } - } - //Single-keyed cookie that was set via scripting. - if (state == 0 && cookie.charAt(i) == '='){ - if(this.controller.getCookieJS()) state = 1; - else { - if (referrer == channel.getRequestHeader("Host")) state = 1; - else state = 2; - } - } - //End of a cookie - if (cookie.charAt(i) == ';') { - var thisCookie = cookie.toString().substr(lastStart, i - lastStart + 2); - if (state == 1){ - newHeader += thisCookie; - } - if (state == 2){ - SSC_dump("Declining to send " + thisCookie + - " for request by embedded domain " + channel.URI.host + - + " " + channel.getRequestHeader("Host") + - " on embedding page " + referrer); - } - lastStart = i+2; - state = 0; - } - //End of the string - if (i == cookie.length - 1){ - thisCookie = cookie.toString().substr(lastStart, i - lastStart + 1); - if (state == 1){ - newHeader += thisCookie; - } - if (state == 2){ - SSC_dump("Declining to send " + thisCookie + - " for request by embedded domain " + channel.URI.host + - + " " + channel.getRequestHeader("Host") + - " on embedding page " + referrer); - } - lastStart = i+1; - } - i++; - } - channel.setRequestHeader("Cookie", newHeader, false); - } - - }, - - onExamineResponse: function(channel) { - var setCookie; - try{ - setCookie = channel.getResponseHeader("Set-Cookie"); - } catch(e) {setCookie = null;} - - if(setCookie) { - var parent = null; - // XXX: need to use loadGroup here if null.. - if (channel.notificationCallbacks) { - var wind = channel.notificationCallbacks.QueryInterface( - Components.interfaces.nsIInterfaceRequestor).getInterface( - Components.interfaces.nsIDOMWindow); - parent = wind.window.top.location; - } - - if (channel.documentURI && channel.documentURI == channel.URI) { - parent = null; // first party interaction - } - - var referrer; - // Same-origin policy - if (parent && parent.hostname != channel.URI.host) { - //SSC_dump("Segmenting " + channel.URI.host + - //" content loaded by " + parent.host); - referrer = parent.hostname; - } else { - referrer = channel.URI.host; - } - //Dual-key each cookie set in the header - var newHeader = ""; - var i = 0; - var lastStart = 0; - //Some messy code that prevents multiple embedding-domain keys - //from being concatenated to cookie names. - var passedname = false; - var namebar = false; - while (i < setCookie.length) { - if (setCookie.charAt(i) == '=') passedname = true; - else if (setCookie.charAt(i) == '|' && passedname == false) - namebar = true; - if (i == setCookie.length - 1 || setCookie.charAt(i) == '\n'){ - if(!namebar){ - newHeader += referrer + "|" + - setCookie.toString().substr(lastStart, i - lastStart + 1); - } - lastStart = i+1; - passedname = false; - namebar = false; - } - i++; - } - //SSC_dump("MODIFIED Set-Cookie: " + newHeader); - channel.setResponseHeader("Set-Cookie", newHeader, false); - } - }, - - // Read the integer data contained in a cache key - readCacheKey: function(channel) { - try { - return channel.cacheDomain; - } catch(e) { - channel.cacheKey.QueryInterface(Components.interfaces.nsISupportsPRUint32); - return channel.cacheKey.data; - } - }, - - // Construct a new cache key with some integer data - newCacheKey: function(data) { - var cacheKey = - Components.classes["@mozilla.org/supports-PRUint32;1"] - .createInstance(Components.interfaces.nsISupportsPRUint32); - cacheKey.data = data; - return cacheKey; - }, - - strMD5: function(str) { - var converter = - Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]. - createInstance(Components.interfaces.nsIScriptableUnicodeConverter); - - // nsIURI.host is UTF-8 - converter.charset = "UTF-8"; - // result.value will contain the array length - var result = {}; - // data is an array of bytes - var data = converter.convertToByteArray(str, result); - var ch = Components.classes["@mozilla.org/security/hash;1"] - .createInstance(Components.interfaces.nsICryptoHash); - ch.init(ch.MD5); - ch.update(data, data.length); - return ch.finish(false); - }, - - // Get an integer hash of a string - getHash: function(str) { - var hash = this.strMD5(str); - var intHash = 0; - for(var i = 0; i < hash.length && i < 8; i++) - intHash += hash.charCodeAt(i) << (i << 3); - return intHash; - }, -} - -/** - * Master control object. Adds and removes the RequestListener - */ -function SSC_Controller() { - this.prefs = Components.classes["@mozilla.org/preferences-service;1"] - .getService(Components.interfaces.nsIPrefService); - this.addListener(new SSC_RequestListener(this)); -} - -SSC_Controller.prototype = { - - getEnabled: function() { - return (this.prefs.getIntPref(kSSC_ENABLED_PREF)); - }, - - getSafeCookieEnabled: function() { - return (this.prefs.getBoolPref(kSSC_SC_ENABLED_PREF)); - }, - - getBlockThirdPartyCache: function() { - // Meh, no pref for now. Always allow. - return false; - }, - - getTorButton: function() { - return (this.prefs.getBoolPref(kSSC_TORBUTTON_PREF)); - }, - - getCookieJS: function() { - return (this.prefs.getBoolPref(kSSC_COOKIE_JS_PREF)); - }, - - addListener: function(listener) { - this.listener = listener; - var observerService = - Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.addObserver(listener, "http-on-modify-request", false); - // XXX: We need an observer to add this listener when the pref gets set - if (this.getSafeCookieEnabled()) { - observerService.addObserver(listener, "http-on-examine-response", false); - } - }, - - removeListener: function() { - var observerService = - Components.classes["@mozilla.org/observer-service;1"] - .getService(Components.interfaces.nsIObserverService); - observerService.removeObserver(this.listener, "http-on-modify-request"); - if (this.getSafeCookieEnabled()) { - observerService.removeObserver(this.listener, "http-on-examine-response"); - } - }, -} - -//////////////////////////////////////////////////////////////////////////// -// Global stuff -// "What script would be complete without a couple of globals?" --Fritz - -var SSC_controller; - -function SSC_startup() { - if(!SSC_controller) SSC_controller = new SSC_Controller(); - SSC_dump("Loaded controller"); -} diff --git a/src/chrome/content/torbutton.xul b/src/chrome/content/torbutton.xul index 00dc6f0..95624f0 100644 --- a/src/chrome/content/torbutton.xul +++ b/src/chrome/content/torbutton.xul @@ -6,10 +6,6 @@ <overlay id="torbutton-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - -  - <script src="chrome://torbutton/content/stanford-safecache.js" /> - <script type="application/x-javascript" src="chrome://torbutton/content/torbutton_util.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/tor-circuit-display.js" /> <script type="application/x-javascript" src="chrome://torbutton/content/torbutton.js" />

1 0