- tbb-commits - lists.torproject.org

[tor-browser-bundle/maint-3.6] Bug 12249: Don't create PT debug files anymore.
by gk＠torproject.org 19 Jun '14

19 Jun '14

commit f8080ed91c5a0f586a935e6fec116459583e7974 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 19 07:14:09 2014 +0000 Bug 12249: Don't create PT debug files anymore. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 3 --- gitian/mkbundle-linux.sh | 1 - 2 files changed, 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index b2d57c0..826b3b7 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,7 +46,6 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR - mkdir -p $INSTDIR/Debug/ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC @@ -185,6 +184,4 @@ script: | # Grabbing the results cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ - ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-debug.zip Debug/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ - cp pluggable-transports-linux$GBUILD_BITS-debug.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 330e475..0d07364 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -216,7 +216,6 @@ then fi cp -a build/out/pluggable-transports-linux*-gbuilt.zip inputs/ - cp -a build/out/pluggable-transports-linux*-debug.zip inputs/ #cp -a result/pluggable-transports-linux-res.yml inputs/ else echo

1 0

[tor-browser/tor-browser-24.6.0esr-4.x-1] fixup! Tor Browser's official .mozconfigs.
by mikeperry＠torproject.org 18 Jun '14

18 Jun '14

commit d15bdd2f437a8f6d8c83dbd20a81af01311cbf34 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 18 06:41:00 2014 -0700 fixup! Tor Browser's official .mozconfigs. Add .mozconfig-asan for #10599. --- .mozconfig-asan | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.mozconfig-asan b/.mozconfig-asan new file mode 100644 index 0000000..32e3096 --- /dev/null +++ b/.mozconfig-asan @@ -0,0 +1,33 @@ +. $topsrcdir/browser/config/mozconfig + +export CFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined" +# When compiling with GCC 4.9.0 we need the libstdc++ either shipped with the +# bundles or link statically against it. We chose the latter as a) the +# resulting size of the bundle is smaller and b) there would probably occur +# issues with our Gitian setup as we compile GCC without LIBFAKETIME being set +# due to bug 11459. +export CXXFLAGS="-fsanitize=address -Dxmalloc=myxmalloc -fsanitize=undefined -static-libstdc++" +export LDFLAGS="-fsanitize=address -fsanitize=undefined" + +mk_add_option sMOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ +mk_add_options MOZ_APP_DISPLAYNAME=TorBrowser +mk_add_options MOZ_MAKE_FLAGS="-j4" +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +ac_add_options --enable-address-sanitizer +ac_add_options --disable-jemalloc +ac_add_options --disable-elf-hack + +ac_add_options --enable-optimize +#ac_add_options --disable-optimize +ac_add_options --enable-official-branding +ac_add_options --disable-strip +ac_add_options --disable-install-strip +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-maintenance-service +ac_add_options --disable-updater +ac_add_options --disable-crashreporter +ac_add_options --disable-webrtc +#ac_add_options --disable-ctypes

1 0

[tor-browser-bundle/maint-3.6] Bug 11102: Adding --class to set proper WM_CLASS.
by gk＠torproject.org 16 Jun '14

16 Jun '14

commit ebbe454dcc65684b7c8ed508fe3d4e7cef46f723 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 16 15:34:28 2014 +0000 Bug 11102: Adding --class to set proper WM_CLASS. Without adapting the WM_CLASS property to be aware of Tor Browser the latter gets grouped together with Firefox (instead of creating its own application group) on systems using GNOME 3. --- RelativeLink/RelativeLink.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index ad155f9..c10a1e8 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -227,7 +227,8 @@ cd "${HOME}" # (probably filenames or URLs) to Firefox. # !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. # !!! Use at your own risk! -./Browser/firefox -no-remote -profile Data/Browser/profile.default "${@}" +# Adding --class argument for fixing bug 11102. +./Browser/firefox -no-remote --class "Tor Browser" -profile Data/Browser/profile.default "${@}" exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser-bundle/master] Bug 11102: Adding --class to set proper WM_CLASS.
by gk＠torproject.org 16 Jun '14

16 Jun '14

commit e02da47395a8f1232f938f62d44a6b1815055b21 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 16 15:37:04 2014 +0000 Bug 11102: Adding --class to set proper WM_CLASS. Without adapting the WM_CLASS property to be aware of Tor Browser the latter gets grouped together with Firefox (instead of creating its own application group) on systems using GNOME 3. --- RelativeLink/RelativeLink.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index a03c0e1..f656665 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -227,7 +227,8 @@ cd "${HOME}" # (probably filenames or URLs) to Firefox. # !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. # !!! Use at your own risk! -./firefox -profile TorBrowser/Data/Browser/profile.default "${@}" +# Adding --class for fixing bug 11102. +./firefox --class "Tor Browser" -profile TorBrowser/Data/Browser/profile.default "${@}" exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser-bundle/master] Bug 12390: Remove old bug11641 references in tags.
by gk＠torproject.org 13 Jun '14

13 Jun '14

commit 5b4c3fe36ce264f7547d7713073876ecedb51e58 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 13 16:13:31 2014 +0000 Bug 12390: Remove old bug11641 references in tags. --- gitian/versions | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index d37a117..6c78434 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,14 +4,14 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.5.0esr +FIREFOX_VERSION=24.6.0esr -TORBROWSER_TAG=bug11641 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=tor-0.2.4.22 -TORLAUNCHER_TAG=bug11641 +TORLAUNCHER_TAG=0.2.6.0 TORBUTTON_TAG=1.6.9.0 HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 -NSIS_TAG=bug11641 +NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184

1 0

[tor-browser-bundle/master] Bug 12249: Don't create PT debug files anymore.
by gk＠torproject.org 11 Jun '14

11 Jun '14

commit 6cac5325f97ade66f13cb9a843b334570ceafbdb Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 11 14:15:23 2014 +0000 Bug 12249: Don't create PT debug files anymore. --- gitian/descriptors/linux/gitian-pluggable-transports.yml | 3 --- gitian/mkbundle-linux.sh | 1 - 2 files changed, 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index b2d57c0..826b3b7 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -46,7 +46,6 @@ script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" mkdir -p $PTDIR - mkdir -p $INSTDIR/Debug/ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC @@ -185,6 +184,4 @@ script: | # Grabbing the results cd $INSTDIR ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ - ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-debug.zip Debug/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ - cp pluggable-transports-linux$GBUILD_BITS-debug.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 330e475..0d07364 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -216,7 +216,6 @@ then fi cp -a build/out/pluggable-transports-linux*-gbuilt.zip inputs/ - cp -a build/out/pluggable-transports-linux*-debug.zip inputs/ #cp -a result/pluggable-transports-linux-res.yml inputs/ else echo

1 0

[tor-launcher/master] Bug #11699: Change & #160 to   in network-settings.dtd
by brade＠torproject.org 10 Jun '14

10 Jun '14

commit e9445a7eb437115e8956e4c95dd805aab8238c56 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jun 10 13:33:58 2014 -0400 Bug #11699: Change &#160 to   in network-settings.dtd Remove 'si' locale files (locale has been removed from Transifex). --- src/chrome/locale/si/network-settings.dtd | 64 --------------------------- src/chrome/locale/si/progress.dtd | 4 -- src/chrome/locale/si/torlauncher.properties | 57 ------------------------ 3 files changed, 125 deletions(-) diff --git a/src/chrome/locale/si/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/si/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/si/progress.dtd b/src/chrome/locale/si/progress.dtd deleted file mode 100644 index ebd9cef..0000000 --- a/src/chrome/locale/si/progress.dtd +++ /dev/null @@ -1,4 +0,0 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> diff --git a/src/chrome/locale/si/torlauncher.properties b/src/chrome/locale/si/torlauncher.properties deleted file mode 100644 index a2550db..0000000 --- a/src/chrome/locale/si/torlauncher.properties +++ /dev/null @@ -1,57 +0,0 @@ -### Copyright (c) 2014, The Tor Project, Inc. -### See LICENSE for licensing information. - -torlauncher.error_title=Tor Launcher - -torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. -torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). - -torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S -torlauncher.tor_missing=The Tor executable is missing. -torlauncher.torrc_missing=The torrc file is missing. -torlauncher.datadir_missing=The Tor data directory does not exist. -torlauncher.password_hash_missing=Failed to get hashed password. - -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.recommended_bridge=(recommended) - -torlauncher.connect=Connect -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S - -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error

1 0

[tor-browser-bundle/master] Update component versions for the nightlies.
by gk＠torproject.org 10 Jun '14

10 Jun '14

commit 846204b4cccffbbca2cfa9f5659c7a8a3087a964 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 10 13:47:46 2014 +0000 Update component versions for the nightlies. --- gitian/versions.nightly | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 9958aab..7bcec3e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.5.0esr +FIREFOX_VERSION=24.6.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=master @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1g +OPENSSL_VER=1.0.1h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 @@ -40,13 +40,13 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 -HTTPSE_VER=3.5.1 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.20-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.28-fx+sm+fn.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 @@ -69,12 +69,12 @@ LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 +OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067

1 0

[tor-browser-bundle/master] Revert "Bug 11630: Make rules.sqlite deterministic."
by gk＠torproject.org 10 Jun '14

10 Jun '14

commit 33b119203bc96160fd9ade5af984a2d4f5c74e29 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jun 10 13:32:31 2014 +0200 Revert "Bug 11630: Make rules.sqlite deterministic." This reverts commit d7dc1e0781aa2735e6ed98d68fed9f54f1c2a374. It turns out there is more to the deterministic issue than thought. --- gitian/descriptors/linux/gitian-bundle.yml | 11 ++++++----- gitian/descriptors/mac/gitian-bundle.yml | 9 +++++---- gitian/descriptors/windows/gitian-bundle.yml | 11 ++++++----- gitian/fetch-inputs.sh | 6 ++++-- gitian/verify-tags.sh | 2 +- gitian/versions | 6 +++++- gitian/versions.alpha | 6 +++++- gitian/versions.beta | 6 +++++- gitian/versions.nightly | 4 ++++ 9 files changed, 41 insertions(+), 20 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index c96d950..8543a33 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" @@ -88,13 +89,13 @@ script: | ~/build/dzip.sh ../../../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/ cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 1e3649b..d959d82 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -40,6 +40,7 @@ files: - "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "ddmg.sh" - "libdmg.patch" @@ -94,12 +95,12 @@ script: | ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + # cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + # rm -f .git/refs/heads/master + # ./makexpi.sh + # cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi # cd .. # cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index f4cbf9c..8f21b3b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -36,6 +36,7 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" @@ -77,13 +78,13 @@ script: | ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - ./makexpi.sh - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 39c1608..34e8727 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -208,8 +208,9 @@ done cd .. -# NoScript is magikal and special: +# NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} +wget -U "" -N ${HTTPSE_URL} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; @@ -228,7 +229,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -264,6 +265,7 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$HTTPSE_PACKAGE" https-everywhere(a)eff.org.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4367e13..324a27a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -132,7 +132,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 1f74a48..d37a117 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ TORBROWSER_TAG=bug11641 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=bug11641 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=bug11641 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,11 +41,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.22-sm+fx+fn.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 8fc13d6..ce3520c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-24.5.0esr-4.x-1 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=master TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,11 +41,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.22-sm+fx+fn.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.beta b/gitian/versions.beta index cebfae2..817a880 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,11 +41,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.22-sm+fx+fn.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index d3bfe31..9958aab 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,12 +40,14 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +HTTPSE_VER=3.5.1 PARSLEY_VER=1.2 ## 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.8.20-fn+fx+sm.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC…

1 0

[tor-browser-bundle/maint-3.6] Space does matter, really.
by gk＠torproject.org 08 Jun '14

08 Jun '14

commit a8d74208460ed509341276ba810b9aa3bea17f66 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 8 21:08:38 2014 +0000 Space does matter, really. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 10710ba..b8155a7 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0 -HTTPSE_TAG=3.5.1# XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/maint-3.6] Bug 11630: Backing out the proposed fix.
by gk＠torproject.org 08 Jun '14

08 Jun '14

commit f8973785b36d15d19c4feedcbec52625894f6292 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Jun 8 21:03:43 2014 +0000 Bug 11630: Backing out the proposed fix. It turns out that the VACUUM call does not solve the problem in our Gitian setup. At least not in the way it was implemented. --- Bundle-Data/Docs/ChangeLog.txt | 3 +-- gitian/descriptors/linux/gitian-bundle.yml | 13 ++++++------- gitian/descriptors/mac/gitian-bundle.yml | 13 ++++++------- gitian/descriptors/windows/gitian-bundle.yml | 13 ++++++------- gitian/fetch-inputs.sh | 6 ++++-- gitian/verify-tags.sh | 2 +- gitian/versions | 6 +++++- gitian/versions.alpha | 5 ++++- gitian/versions.beta | 6 +++++- gitian/versions.nightly | 6 +++++- 10 files changed, 43 insertions(+), 30 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 41f44ce..3ea5232 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 3.6.2 -- Jun 6 2014 +Tor Browser Bundle 3.6.2 -- Jun 9 2014 * All Platforms * Update Firefox to 24.6.0esr * Update OpenSSL to 1.0.1h @@ -26,7 +26,6 @@ Tor Browser Bundle 3.6.2 -- Jun 6 2014 * Bug 12212: Disable deprecated webaudio API * Bug 11253: Turn on TLS 1.1 and 1.2. * Bug 11817: Don't send startup time information to Mozilla. - * Bug 11630: Make HTTPS-Everywhere 3.5's rules.sqlite deterministic. Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 214b9a2..006883c 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" @@ -88,15 +89,13 @@ script: | ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - # Backport the fix for #11630 from HTTPS-Everywhere trunk. - sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py - ./makexpi.sh - cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ cd tor-browser/Data/Browser/profile.default/extensions diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index d5da018..32975a6 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "ddmg.sh" - "libdmg.patch" @@ -95,15 +96,13 @@ script: | ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - # Backport the fix for #11630 from HTTPS-Everywhere trunk. - sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py - ./makexpi.sh - cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index ec128be..ebde49b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -37,6 +37,7 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" +- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" @@ -78,15 +79,13 @@ script: | ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # - cd https-everywhere + #cd https-everywhere # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 - rm -f .git/refs/heads/master - # Backport the fix for #11630 from HTTPS-Everywhere trunk. - sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py - ./makexpi.sh - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi - cd .. + #rm -f .git/refs/heads/master + #./makexpi.sh + #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cd .. # cp *.xpi tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions cd tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index ddd7a19..be5c9d9 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -208,8 +208,9 @@ done cd .. -# NoScript is magikal and special: +# NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} +wget -U "" -N ${HTTPSE_URL} # So is mingw: if [ ! -f mingw-w64-svn-snapshot.zip ]; @@ -228,7 +229,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -264,6 +265,7 @@ done cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi +ln -sf "$HTTPSE_PACKAGE" https-everywhere(a)eff.org.xpi ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 4367e13..324a27a 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -132,7 +132,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 45414ee..10710ba 100755 --- a/gitian/versions +++ b/gitian/versions @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.5.1# XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,11 +41,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.28-fx+sm+fn.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 197f069..5ad3b82 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -44,6 +44,7 @@ LXML_VER=3.3.5 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.20-fn+fx+sm.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -70,6 +71,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -90,6 +92,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.beta b/gitian/versions.beta index cebfae2..5a9f2b8 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.5.1 +HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,11 +41,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.22-sm+fx+fn.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0f86bab..a88421b 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=master +HTTPSE_TAG=master # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -41,11 +41,13 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.8.20-fn+fx+sm.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -73,6 +75,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -94,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC…

1 0

[tor-browser-bundle/maint-3.6] Bug 11630: Backport the fix from HTTPS-E trunk.
by gk＠torproject.org 07 Jun '14

07 Jun '14

commit 3e9088694cb0bed1780914b775570151ebf7f2bf Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 7 10:27:57 2014 +0000 Bug 11630: Backport the fix from HTTPS-E trunk. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index c16589a..214b9a2 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -92,6 +92,8 @@ script: | # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master + # Backport the fix for #11630 from HTTPS-Everywhere trunk. + sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py ./makexpi.sh cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 263ca57..d5da018 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -99,6 +99,8 @@ script: | # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master + # Backport the fix for #11630 from HTTPS-Everywhere trunk. + sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py ./makexpi.sh cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 457fa7b..ec128be 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -82,6 +82,8 @@ script: | # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master + # Backport the fix for #11630 from HTTPS-Everywhere trunk. + sed 's/conn.commit()/&\nconn.execute("VACUUM")/' -i utils/make-sqlite.py ./makexpi.sh cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd ..

1 0

[tor-browser-bundle/maint-3.6] And the twisted hash...
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit afc42d98e6b254ed77e4d5cdf9cdbd9bf9027221 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 09:07:55 2014 -0700 And the twisted hash... --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 01a18ec..45414ee 100755 --- a/gitian/versions +++ b/gitian/versions @@ -79,7 +79,7 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc -TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39

1 0

[tor-browser-bundle/maint-3.6] Update twisted version for proxy support.
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit 03a977f7be49ba0be35b76f3d663bd484a2a8681 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 09:01:01 2014 -0700 Update twisted version for proxy support. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 07cac6c..01a18ec 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 -TWISTED_VER=13.1.0 +TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4

1 0

[tor-browser-bundle/maint-3.6] Update Firefox version.
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit 164e557856e759a984fedaa5e71cc0036f10db49 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 06:40:04 2014 -0700 Update Firefox version. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 3031ba9..07cac6c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -6,7 +6,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.6.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0

1 0

[tor-browser/tor-browser-24.6.0esr-4.x-1] Fix mingw-w64 build failure introduced in FF24.6.0esr.
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit 306bbfd61905a786c329cb329d9cb6827f035c6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 06:34:01 2014 -0700 Fix mingw-w64 build failure introduced in FF24.6.0esr. Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1019003 --- js/src/jstypedarray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index a78edd4..735c608 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -3480,7 +3480,7 @@ const JSFunctionSpec _typedArray::jsfuncs[] = { \ return obj; \ return NULL; \ } \ - JS_FRIEND_DATA(const js::Class* const) js::detail::Name ## ArrayClassPtr = \ + const js::Class* const js::detail::Name ## ArrayClassPtr = \ &js::TypedArray::classes[TypedArrayTemplate<NativeType>::ArrayTypeID()]; IMPL_TYPED_ARRAY_JSAPI_CONSTRUCTORS(Int8, int8_t)

1 0

[tor-browser/tor-browser-24.6.0esr-3.x-1] Fix mingw-w64 build failure introduced in FF24.6.0esr.
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit 90ba8fbaf6f23494f1a0e38d63153b3b7e65d3d3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 06:34:01 2014 -0700 Fix mingw-w64 build failure introduced in FF24.6.0esr. Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1019003 --- js/src/jstypedarray.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp index a78edd4..735c608 100644 --- a/js/src/jstypedarray.cpp +++ b/js/src/jstypedarray.cpp @@ -3480,7 +3480,7 @@ const JSFunctionSpec _typedArray::jsfuncs[] = { \ return obj; \ return NULL; \ } \ - JS_FRIEND_DATA(const js::Class* const) js::detail::Name ## ArrayClassPtr = \ + const js::Class* const js::detail::Name ## ArrayClassPtr = \ &js::TypedArray::classes[TypedArrayTemplate<NativeType>::ArrayTypeID()]; IMPL_TYPED_ARRAY_JSAPI_CONSTRUCTORS(Int8, int8_t)

1 0

[tor-launcher/master] Bug #11699: Change & #160 to   in network-settings.dtd
by brade＠torproject.org 06 Jun '14

06 Jun '14

commit 708f845964d77e489cdd6d062b8bc16f8498d84c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jun 6 09:09:10 2014 -0400 Bug #11699: Change &#160 to   in network-settings.dtd The problem has recurred for this file. --- src/chrome/locale/si/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/si/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd index 4cedae6..a346274 100644 --- a/src/chrome/locale/si/network-settings.dtd +++ b/src/chrome/locale/si/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -54,11 +54,11 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">

1 0

[tor-browser-bundle/maint-3.6] Update OpenSSL hash.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 6c6c96517f10238c8ff7400705fcc060f3b5ec11 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 10:06:07 2014 -0700 Update OpenSSL hash. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 0992031..3031ba9 100755 --- a/gitian/versions +++ b/gitian/versions @@ -67,7 +67,7 @@ LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 +OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-3.6] Update 3.6.2 changelog: Mention 11630 and fix a typo.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 04c05d304a21ac609c3576500443da765fb053d2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 09:46:36 2014 -0700 Update 3.6.2 changelog: Mention 11630 and fix a typo. --- Bundle-Data/Docs/ChangeLog.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c7e3d89..41f44ce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -14,18 +14,19 @@ Tor Browser Bundle 3.6.2 -- Jun 6 2014 * Bug 11783: Avoid b.webProgress error when double-clicking on New Identity * Bug 11722: Add hidden pref to force remote Tor check * Bug 11763: Fix pref dialog double-click race that caused settings to be reset - * Bug 11629: Support proxies with pluggable Transports + * Bug 11629: Support proxies with Pluggable Transports * Updates FTEProxy to 0.2.15 * Updates obfsproxy to 0.2.9 * Backported Tor Patches: * Bug 11654: Fix malformed log message in bug11156 patch. * Bug 10425: Add in Tor's geoip6 files to the bundle distribution - * Bugs 11834 and 11835: Include pluggable transport documentation + * Bugs 11834 and 11835: Include Pluggable Transport documentation * Bug 9701: Prevent ClipBoardCache from writing to disk. * Bug 12146: Make the CONNECT Host header the same as the Request-URI. * Bug 12212: Disable deprecated webaudio API * Bug 11253: Turn on TLS 1.1 and 1.2. * Bug 11817: Don't send startup time information to Mozilla. + * Bug 11630: Make HTTPS-Everywhere 3.5's rules.sqlite deterministic. Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms

1 0

[tor-browser-bundle/maint-3.6] Prune dead tags during git fetch.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 35e9a826033ca1d324e461f94126f6602bb3a2b6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 13:27:20 2014 -0700 Prune dead tags during git fetch. fteproxy created and removed some crazy branches that managed to break git updates without a prune step. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index fb2464a..ddd7a19 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -90,7 +90,7 @@ update_git() { if [ -d "$dir/.git" ]; then - (cd "$dir" && git remote set-url origin $url && git fetch origin && git fetch --tags origin) + (cd "$dir" && git remote set-url origin $url && git fetch --prune origin && git fetch --prune --tags origin) else if ! git clone "$url"; then echo >&2 "Error: Cloning $url failed"

1 0

[tor-browser-bundle/maint-3.6] Allow the urls of git inputs to change without issue.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 7a3c07fc7311618dcfc6c1bb35655b1c9fec8c73 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 13:09:15 2014 -0700 Allow the urls of git inputs to change without issue. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 37a4a47..fb2464a 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -90,7 +90,7 @@ update_git() { if [ -d "$dir/.git" ]; then - (cd "$dir" && git fetch origin && git fetch --tags origin) + (cd "$dir" && git remote set-url origin $url && git fetch origin && git fetch --tags origin) else if ! git clone "$url"; then echo >&2 "Error: Cloning $url failed"

1 0

[tor-browser-bundle/maint-3.6] Bump component versions for 3.6.2.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 9098bcfcfe234b1560908901b7cb16242fbac773 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 08:48:16 2014 -0700 Bump component versions for 3.6.2. --- gitian/versions | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gitian/versions b/gitian/versions index 2176c74..0992031 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,15 +1,15 @@ -TORBROWSER_VERSION=3.6.2pre +TORBROWSER_VERSION=3.6.2 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -FIREFOX_VERSION=24.5.0esr +FIREFOX_VERSION=24.6.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 TOR_TAG=tor-0.2.4.22 -TORLAUNCHER_TAG=0.2.5.4 -TORBUTTON_TAG=1.6.9.0 +TORLAUNCHER_TAG=0.2.5.5 +TORBUTTON_TAG=1.6.10.0 HTTPSE_TAG=3.5.1 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GITIAN_TAG=tor-browser-builder-3.x-5 -OPENSSL_VER=1.0.1g +OPENSSL_VER=1.0.1h GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 @@ -45,7 +45,7 @@ PARSLEY_VER=1.2 ## 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.8.22-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.28-fx+sm+fn.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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -72,7 +72,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +NOSCRIPT_HASH=aea2ef3a262a70e871df0de937ac8f53cd2c5d1913066200d192bb6e30924275 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-3.6] Changelog for 3.6.2.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit ae2b7423991cbeeeb8459030eeb616ae9e41ee3d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 08:45:36 2014 -0700 Changelog for 3.6.2. --- Bundle-Data/Docs/ChangeLog.txt | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 7ad5f87..c7e3d89 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,32 @@ +Tor Browser Bundle 3.6.2 -- Jun 6 2014 + * All Platforms + * Update Firefox to 24.6.0esr + * Update OpenSSL to 1.0.1h + * Update NoScript to 2.6.8.28 + * Update Tor to 0.2.4.22 + * Update Tor Launcher to 0.2.5.5 + * Bug 10425: Provide geoip6 file location to Tor process + * Bug 11754: Remove untranslated locales that were dropped from Transifex + * Bug 11772: Set Proxy Type menu correctly after restart + * Bug 11699: Change &#160 to   in UI elements + * Update Torbutton to 1.6.10.0 + * Bug 11510: about:tor should not report success if tor proxy is unreachable + * Bug 11783: Avoid b.webProgress error when double-clicking on New Identity + * Bug 11722: Add hidden pref to force remote Tor check + * Bug 11763: Fix pref dialog double-click race that caused settings to be reset + * Bug 11629: Support proxies with pluggable Transports + * Updates FTEProxy to 0.2.15 + * Updates obfsproxy to 0.2.9 + * Backported Tor Patches: + * Bug 11654: Fix malformed log message in bug11156 patch. + * Bug 10425: Add in Tor's geoip6 files to the bundle distribution + * Bugs 11834 and 11835: Include pluggable transport documentation + * Bug 9701: Prevent ClipBoardCache from writing to disk. + * Bug 12146: Make the CONNECT Host header the same as the Request-URI. + * Bug 12212: Disable deprecated webaudio API + * Bug 11253: Turn on TLS 1.1 and 1.2. + * Bug 11817: Don't send startup time information to Mozilla. + Tor Browser Bundle 3.6.1 -- May 6 2014 * All Platforms * Update HTTPS-Everywhere to 3.5.1

1 0

[tor-browser/tor-browser-24.6.0esr-3.x-1] Bug 10895: Fix language pack usage (fix Firefox version).
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 6b554ada57da71483628679974eb031f07d01975 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 07:39:04 2014 -0700 Bug 10895: Fix language pack usage (fix Firefox version). --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 60f1860..b5e8f5c 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.6.0esrpre +24.6.0 diff --git a/config/milestone.txt b/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0

1 0