April 2015 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 844949ea30735a7494099aeb2be5b61c20583285 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 21 14:59:41 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 192159b..a277e9d 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -87,6 +87,8 @@ pref("javascript.use_us_english_locale", true); // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton +// Disable device sensors as possible fingerprinting vector (bug 15758) +pref("device.sensors.enabled", false); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit ab48482bd24a4389a3db2438be807dc303ca2933 Merge: f0fe46b 8dff562 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:28:28 2015 -0700 Merge remote-tracking branch 'gk/bug_15757' into tor-browser-31.6.0esr-4.5-1 browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 89bd8f1c5b3e58dfbf9cf33692abfb2be78cd6cf Merge: ab48482 844949e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:29:02 2015 -0700 Merge remote-tracking branch 'gk/bug_15758' into tor-browser-31.6.0esr-4.5-1 Conflicts: browser/app/profile/000-tor-browser.js browser/app/profile/000-tor-browser.js | 2 ++ 1 file changed, 2 insertions(+) diff --cc browser/app/profile/000-tor-browser.js index 7967db1,a277e9d..e7e4ca9 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@@ -87,8 -87,8 +87,10 @@@ pref("javascript.use_us_english_locale" // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton +// Disable video statistics fingerprinting vector (bug 15757) +pref("media.video_stats.enabled", false); + // Disable device sensors as possible fingerprinting vector (bug 15758) + pref("device.sensors.enabled", false); // Third party stuff pref("network.cookie.cookieBehavior", 1);

1 0

[tor-browser-bundle/master] Bug 15539: Make stripping signatures reproducible
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit e487b6ffca7b023442fd8820eed8345a20310fde Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 21 11:32:00 2015 +0000 Bug 15539: Make stripping signatures reproducible NSIS is neither padding properly nor creating a correct PE-file checksum. This makes it hard to verify that the Windows installer we ship is actually matching the one we got built reproducibly. This fix makes sure that we pad the .exe where needed and that the PE-file checksum is generated. Thanks to a cypherpunk for this workaround idea. --- gitian/build-helpers/pe_checksum_fix.py | 56 ++++++++++++++++++++++++++ gitian/descriptors/windows/gitian-bundle.yml | 14 +++++++ 2 files changed, 70 insertions(+) diff --git a/gitian/build-helpers/pe_checksum_fix.py b/gitian/build-helpers/pe_checksum_fix.py new file mode 100755 index 0000000..101e77f --- /dev/null +++ b/gitian/build-helpers/pe_checksum_fix.py @@ -0,0 +1,56 @@ +#!/usr/bin/env python + +# Copyright (c) 2015, The Tor Project, Inc. +# +# 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 names of the copyright owners 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. + +""" +NSIS is neither padding nor calculating the PE-file checksum. But the tool +we use for signing and the tools for stripping the signature do which leads to a +SHA256 mismatch if one tries to check that the binary we offer is actually the +the one we got from our reproducible builds. + +This small Python snippet does both things: It pads the .exe if necessary and it +recalculates the PE-file checksum. Details of the discussion can be foun in bug +15339: https://bugs.torproject.org/15539. + +Thanks to a cypherpunk for this workaround idea. +""" + +import pefile; + +f = open('torbrowser-install-tmp.exe') +exe = f.read() +f.close() +remainder = len(exe) % 8 +if remainder > 0: + exe += '\0' * (8 - remainder) +pef = pefile.PE(data=exe, fast_load=True) +pef.OPTIONAL_HEADER.CheckSum = pef.generate_checksum() +pef.write(filename='torbrowser-install-tmp2.exe') diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 92b9382..54ea258 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -9,6 +9,9 @@ packages: - "unzip" - "zip" - "nsis" +# Needed to compensate NSIS's failure of regenerating the PE-file checksum and +# proper padding. +- "python-pefile" # These three packages are needed for assembling the HTTPS-Everywhere rules # since 5.0. - "python-lxml" @@ -43,6 +46,7 @@ files: - "versions" - "mar-tools-win32.zip" - "tbb-docs.zip" +- "pe_checksum_fix.py" script: | INSTDIR="$HOME/install" source versions @@ -145,6 +149,11 @@ script: | MAR_FILE=tor-browser-win32-${TORBROWSER_VERSION}_en-US.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff.exe $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "Tor Browser"/Browser makensis torbrowser.nsi + # Working around NSIS braindamage + mv torbrowser-install.exe torbrowser-install-tmp.exe + python ~/build/pe_checksum_fix.py + mv torbrowser-install-tmp2.exe torbrowser-install.exe + rm torbrowser-install-tmp.exe mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_en-US.exe # unzip ../win32-langpacks.zip @@ -181,6 +190,11 @@ script: | MAR_FILE=tor-browser-win32-${TORBROWSER_VERSION}_$LANG.mar MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff.exe $MARTOOLS/make_full_update.sh -q $OUTDIR/$MAR_FILE "Tor Browser"/Browser makensis torbrowser.nsi + # Working around NSIS braindamage + mv torbrowser-install.exe torbrowser-install-tmp.exe + python ~/build/pe_checksum_fix.py + mv torbrowser-install-tmp2.exe torbrowser-install.exe + rm torbrowser-install-tmp.exe mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe rm "Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd win32-langpacks

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'gk/bug_15539_v4'
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 3a8088e99b4e2d2a0bdac24b42c2cd285079cee0 Merge: ee481a3 e487b6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:17:58 2015 -0700 Merge remote-tracking branch 'gk/bug_15539_v4' gitian/build-helpers/pe_checksum_fix.py | 56 ++++++++++++++++++++++++++ gitian/descriptors/windows/gitian-bundle.yml | 14 +++++++ 2 files changed, 70 insertions(+)

1 0

[tor-browser-bundle/master] Bug 15747: Improve Linux startup script argument handling.
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit 063f65368f32600904945399f7024be3a6ae1f5f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 20 16:18:38 2015 -0700 Bug 15747: Improve Linux startup script argument handling. This commit makes the following changes: 1. Allows multiple arguments to be specified at once to start-tor-browser 2. Separates --debug from file logging (and creates --log) 3. Solves #15739 by creating -v and --verbose as --debug aliases 4. Solves #15740 by creating -h and -? aliases for --help. 5. Solves #15741 by creating --detach and using it from the .desktop file --- RelativeLink/start-tor-browser | 128 ++++++++++++++++++++++---------- RelativeLink/start-tor-browser.desktop | 29 ++++---- 2 files changed, 103 insertions(+), 54 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 098f506..940ec96 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -3,8 +3,6 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# To run in debug mode simply pass --debug -# # Copyright 2015 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -35,8 +33,8 @@ complain () { # Trim leading newlines, to avoid breaking formatting in some dialogs. complain_message="`echo "$1" | sed '/./,$!d'`" - # If we're being run in debug mode, complain to stderr. - if [ "$debug" -eq 1 ]; then + # If we're being run in debug/verbose mode, complain to stderr. + if [ "$show_output" -eq 1 ]; then echo "$complain_message" >&2 return fi @@ -98,30 +96,82 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -debug=0 +tbb_usage () { + printf "\nTor Browser Script Options\n" + printf " --verbose Display Tor and Firefox output in the terminal\n" + printf " --log [file] Record Tor and Firefox output in file (default: tor-browser.log)\n" + printf " --detach Detach from terminal and run Tor Browser in the background.\n" + printf " --register-app Register Tor Browser as a desktop app for this user\n" + printf " --unregister-app Unregister Tor Browser as a desktop app for this user\n" +} +log_output=0 +show_output=0 +detach=0 show_usage=0 register_desktop_app=0 -# !!! We may have more than one argument, changed -eq to -ge in if & elif clauses below -if [ "$#" -ge 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then - debug=1 - shift # pop the debug argument - printf "\nDebug enabled.\n\n" -elif [ "$#" -ge 1 -a $ "x$1" = "x--register-app" -o "x$1" = "x-register-app" $ ]; then - register_desktop_app=1 - shift # pop the register arg -elif [ "$#" -ge 1 -a $ "x$1" = "x--unregister-app" -o "x$1" = "x-unregister-app" $ ]; then - register_desktop_app=-1 - shift # pop the register arg -elif [ "$#" -ge 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then - show_usage=1 -else +logfile=/dev/null +while : +do + case "$1" in + --detach) + detach=1 + shift + ;; + -v | --verbose | -d | --debug) + show_output=1 + verbose_arg="$2" + shift + ;; + -h | "-?" | --help | -help) + show_usage=1 + show_output=1 + shift + ;; + -l | --log) + if [ -z "$2" -o "${2:0:1}" == "-" ]; then + printf "Logging Tor Browser debug information to tor-browser.log\n" + logfile="../tor-browser.log" + elif [ "${2:0:1}" == "/" -o "${2:0:1}" == "~" ]; then + printf "Logging Tor Browser debug information to %s\n" "$2" + logfile="$2" + shift + else + printf "Logging Tor Browser debug information to %s\n" "$2" + logfile="../$2" + shift + fi + log_output=1 + shift + ;; + --register-app) + register_desktop_app=1 + show_output=1 + shift + ;; + --unregister-app) + register_desktop_app=-1 + show_output=1 + shift + ;; + *) # No more options + break + ;; + esac +done + +# We can't detach and show output at the same time.. +if [ "$show_output" -eq 1 -a "$detach" -eq 1 ]; then + detach=0 +fi + +if [ "$show_output" -eq 0 ]; then # If the user hasn't requested 'debug mode' or --help, close stdout and stderr, # to keep Firefox and the stuff loaded by/for it (including the # system's shared-library loader) from printing messages to # $HOME/.xsession-errors or other files. (Users wouldn't have seen # messages there anyway.) - exec >/dev/null - exec 2>/dev/null + exec > "$logfile" + exec 2> "$logfile" fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority @@ -186,7 +236,7 @@ fi cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop -sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser)' dummy %k,g" ../start-tor-browser.desktop +sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" --detach || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop if [ "$register_desktop_app" -eq 1 ]; then mkdir -p "$HOME/.local/share/applications/" @@ -292,33 +342,29 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} cd "${HOME}" -# We pass all command-line arguments we got (except --debug) to Firefox. Use -# at your own risk! +# We pass all additional command-line arguments we get to Firefox. # # The --class parameter was added to fix bug 11102. -# -# When passed the --debug option, we log all the output that goes to the -# parent terminal stdout and stderr to a file ('tor-browser-debug.log' in Tor -# Browser's $HOME directory). + if [ "$show_usage" -eq 1 ]; then + # Display Firefox help, then our help TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" 2>/dev/null - printf "\nTor Browser Script Options\n" - printf " --debug Display Tor and Firefox output and record in tor-browser-debug.log\n" - printf " --register-app Register Tor Browser as a desktop app for this user\n" - printf " --unregister-app Unregister Tor Browser as a desktop app for this user\n" -elif [ "$debug" -ne 1 ] ; then + -profile TorBrowser/Data/Browser/profile.default --help 2>/dev/null + tbb_usage +elif [ "$detach" -eq 1 ] ; then TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" > /dev/null 2>&1 </dev/null & + -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null & disown "$!" +elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ + -profile TorBrowser/Data/Browser/profile.default "${@}" 2>&1 </dev/null | \ + tee "$logfile" +elif [ "$show_output" -eq 1 ]; then + TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ + -profile TorBrowser/Data/Browser/profile.default "${@}" < /dev/null else - # Place logfile in the tbb root dir. - logfile=../tor-browser-debug.log - printf "Launching Tor Browser for Linux in ${HOME}...\n" - printf "Logging Tor Browser debug information to file: %s\n" "$logfile" TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./firefox --class "Tor Browser" \ - -profile TorBrowser/Data/Browser/profile.default "${@}" -jsconsole 2>&1 </dev/null | \ - tee $logfile + -profile TorBrowser/Data/Browser/profile.default "${@}" > "$logfile" 2>&1 </dev/null fi exit $? diff --git a/RelativeLink/start-tor-browser.desktop b/RelativeLink/start-tor-browser.desktop index c8be973..d6c1c63 100755 --- a/RelativeLink/start-tor-browser.desktop +++ b/RelativeLink/start-tor-browser.desktop @@ -3,21 +3,24 @@ # This file is a self-modifying .desktop file that can be run from the shell. # It preserves arguments and environment for the start-tor-browser script. # -# When run, it will update itself with the absolute path to the current TBB -# location. It is therefore possible to install/relocate this file after first -# run (for example, by copying it to ~/.local/share/applications/ so that Tor -# Browser will appear in your desktop applications menu). +# Run './start-tor-browser.desktop --help' to display the full set of options. +# +# When invoked from the shell, this file must always be in a Tor Browser root +# directory. When run from the file manager or desktop GUI, it is relocatable. +# +# After first invocation, it will update itself with the absolute path to the +# current TBB location, to support relocation of this .desktop file for GUI +# invocation. You can also add Tor Browser to your desktop's application menu +# by running './start-tor-browser.desktop --register-app' +# +# If you use --register-app, and then relocate your TBB directory, Tor Browser +# will no longer launch from your desktop's app launcher/dock. However, if you +# re-run --register-app from inside that new directory, the script +# will correct the absolute paths and re-register itself. # # This file will also still function if the path changes when TBB is used as a # portable app, so long as it is run directly from that new directory, either # via the shell or via the file manager. -# -# If you installed this file to ~/.local/share/applications/ and then relocate -# your TBB directory, Tor Browser will no longer launch from your desktop's -# app launcher/dock. However, if you re-run this file from inside that new -# directory, it will correct the absolute paths, and you can then copy it back -# into ~/.local/share/applications/ again to restore desktop launch -# functionality. [Desktop Entry] Type=Application @@ -25,6 +28,6 @@ Name=Tor Browser Setup GenericName=Web Browser Comment=Tor Browser is +1 for privacy and -1 for mass surveillance Categories=Network;WebBrowser;Security; -Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser)' dummy %k -X-TorBrowser-ExecShell=./Browser/start-tor-browser +Exec=sh -c '"$(dirname "$*")"/Browser/start-tor-browser --detach || ([ ! -x "$(dirname "$*")"/Browser/start-tor-browser ] && "$(dirname "$*")"/start-tor-browser --detach)' dummy %k +X-TorBrowser-ExecShell=./Browser/start-tor-browser --detach Icon=web-browser

1 0

[tor-browser-bundle/master] Merge branch 'bug15747'
by mikeperry＠torproject.org 21 Apr '15

21 Apr '15

commit ee481a3b5c04136c4f1cc4aa4f0d3c2c7a219d5f Merge: c5e0b0b 063f653 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 21 15:08:46 2015 -0700 Merge branch 'bug15747' RelativeLink/start-tor-browser | 128 ++++++++++++++++++++++---------- RelativeLink/start-tor-browser.desktop | 29 ++++---- 2 files changed, 103 insertions(+), 54 deletions(-)

1 0

[tor-browser-bundle/master] fixup! Bug 15689: Switch back to HTTPS-E git repository
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit c5e0b0b7517e5e1e2dfe23506db2d9b7b0939ef1 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 21 11:29:28 2015 +0000 fixup! Bug 15689: Switch back to HTTPS-E git repository Since 5.0.2 a .xpi for AMO is built, too. We don't need it. --- 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 f5ad824..455fc89 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -101,6 +101,8 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh + # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. + rm ./pkg/*-amo.xpi cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/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 7945f5e..61a024b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -109,6 +109,8 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh + # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. + rm ./pkg/*-amo.xpi cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/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 d089e0d..92b9382 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -88,6 +88,8 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 rm -f .git/refs/heads/master ./makexpi.sh + # Since 5.0.2 a .xpi for AMO is built, too. We don't need it. + rm ./pkg/*-amo.xpi cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. #

1 0

[tor-browser-bundle/master] Bug 15689: Switch back to HTTPS-E git repository
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit c04aaaf3d147ae9f46e046e47579c9c3979f3c45 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 17 05:15:32 2015 +0000 Bug 15689: Switch back to HTTPS-E git repository Now that bug 11630 got fixed for HTTPS-Everywhere 5.0 and the latter is shipped in Tor Browser stable we can switch back to using the HTTPS-Everywhere git repository and its signed tags. --- gitian/descriptors/linux/gitian-bundle.yml | 15 ++++++++------- gitian/descriptors/mac/gitian-bundle.yml | 15 ++++++++------- gitian/descriptors/windows/gitian-bundle.yml | 15 ++++++++------- gitian/fetch-inputs.sh | 4 +--- gitian/verify-tags.sh | 4 ++-- gitian/versions | 6 +----- gitian/versions.alpha | 6 +----- gitian/versions.beta | 6 +----- gitian/versions.nightly | 4 ---- 9 files changed, 30 insertions(+), 45 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index b6a4a26..f5ad824 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -9,8 +9,10 @@ packages: - "faketime" - "unzip" - "zip" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +# These three packages are needed for assembling the HTTPS-Everywhere rules +# since 5.0. - "libxslt1.1" +- "libxml2-utils" - "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -41,7 +43,6 @@ files: - "linux-skeleton.zip" - "linux-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "dtar.sh" - "bare-version" @@ -95,13 +96,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 1cf75e9..7945f5e 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -8,8 +8,10 @@ packages: - "faketime" - "unzip" - "zip" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +# These three packages are needed for assembling the HTTPS-Everywhere rules +# since 5.0. - "python-lxml" +- "libxml2-utils" - "sqlite3" # Needed for the .dmgs - "genisoimage" @@ -42,7 +44,6 @@ files: - "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "ddmg.sh" - "background-plist.py" @@ -103,13 +104,13 @@ 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 - # cd .. + 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/ cd $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 76f5c67..d089e0d 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -9,8 +9,10 @@ packages: - "unzip" - "zip" - "nsis" -# Both packages are needed for assembling the HTTPS-Everywhere rules since 3.5. +# These three packages are needed for assembling the HTTPS-Everywhere rules +# since 5.0. - "python-lxml" +- "libxml2-utils" - "sqlite3" reference_datetime: "2000-01-01 00:00:00" remotes: @@ -35,7 +37,6 @@ files: - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" -- "https-everywhere(a)eff.org.xpi" - "dzip.sh" - "bare-version" - "bundle.inputs" @@ -82,13 +83,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 188c702..63460e8 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -164,11 +164,10 @@ done # NoScript and HTTPS-Everywhere are magikal and special: wget -U "" -N ${NOSCRIPT_URL} -wget -U "" -N ${HTTPSE_URL} # 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 HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -204,7 +203,6 @@ 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 846b575..5c1d552 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -102,8 +102,8 @@ flashproxy flashproxy.gpg $FLASHPROXY_TAG goptlib goptlib.gpg $GOPTLIB_TAG meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG +https-everywhere https-everywhere.gpg $HTTPSE_TAG EOF -#https-everywhere https-everywhere.gpg $HTTPSE_TAG while read dir commit; do check_git_hash "$dir" "$commit" @@ -141,7 +141,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 HTTPSE MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY GO GCC do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index a2f7817..3b74f27 100755 --- a/gitian/versions +++ b/gitian/versions @@ -12,7 +12,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build3 TOR_TAG=tor-0.2.5.10 TORLAUNCHER_TAG=0.2.7.0.1 TORBUTTON_TAG=1.7.0.1 -HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.2 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -47,14 +47,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=4.0.1 GO_VER=1.4.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.9.3-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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -82,7 +80,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=d399d724953fe032ccca758e577c2136b8fd6c377cea0e3f42ed999b796d290a -HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -105,7 +102,6 @@ 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/user-media/addons/722/${NOSCRIP… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://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 0077361..718019b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -12,7 +12,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.5-1-build1 TOR_TAG=tor-0.2.6.6 TORLAUNCHER_TAG=0.2.7.3 TORBUTTON_TAG=1.9.1.0 -HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.3 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -52,14 +52,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0 GO_VER=1.4.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.9.19-fx+fn+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 @@ -87,7 +85,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad -HTTPSE_HASH=059b6141b200c18f5903550d0ee6bdec1e1b874b7e069d246466e77bf3a436c2 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -110,7 +107,6 @@ 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/user-media/addons/722/${NOSCRIP… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://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 673b2e5..854e422 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -12,7 +12,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.4.5 +HTTPSE_TAG=5.0.2 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -46,14 +46,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=3.5.1 GO_VER=1.4.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 -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 @@ -82,7 +80,6 @@ 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 @@ -105,7 +102,6 @@ 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=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://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 73bb2ad..5a8eb91 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -55,14 +55,12 @@ PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 PARSLEY_VER=1.2 -HTTPSE_VER=5.0.2 GO_VER=1.4.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.9.21-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 OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -90,7 +88,6 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c -HTTPSE_HASH=a600ad019c982c8c90b8c5022dbf56722974bc1143f49c0db77704986f1b2ced MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 @@ -113,7 +110,6 @@ 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/user-media/addons/722/${NOSCRIP… -HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=https://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/master] Adding jsha's key to the HTTPS-E signing key
by gk＠torproject.org 21 Apr '15

21 Apr '15

commit 713cf60037bf2582d4f290e78780ee00bf461aa8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 16 11:01:09 2015 +0000 Adding jsha's key to the HTTPS-E signing key --- gitian/gpg/https-everywhere.gpg | Bin 83382 -> 112546 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index ced373f..96a2f45 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0