[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'boklm/bug_18331_v6'

[gk at torproject.org]

commit dbb924b5d86201bcd8cbc923f1e416c4c62e3036
Merge: bc9d708 da14737
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Apr 19 07:39:11 2016 +0000

    Merge remote-tracking branch 'boklm/bug_18331_v6'

 gitian/build-helpers/ddmg.sh                       |   2 +-
 gitian/descriptors/mac/gitian-bundle.yml           |   4 ++-
 gitian/descriptors/mac/gitian-firefox.yml          |  23 ++++++--------
 .../mac/gitian-pluggable-transports.yml            |   5 ++-
 gitian/descriptors/mac/gitian-tor.yml              |   8 ++---
 gitian/descriptors/mac/gitian-utils.yml            |  34 +++++++++++++++------
 gitian/fetch-inputs.sh                             |  15 +++++++--
 gitian/gpg/cmake.gpg                               | Bin 0 -> 16939 bytes
 gitian/mkbundle-mac.sh                             |   9 +++---
 gitian/record-inputs.sh                            |   2 +-
 gitian/verify-tags.sh                              |   5 ++-
 gitian/versions                                    |   3 --
 gitian/versions.alpha                              |   3 --
 gitian/versions.beta                               |   3 --
 gitian/versions.nightly                            |  10 ++++--
 15 files changed, 75 insertions(+), 51 deletions(-)

diff --cc gitian/versions.nightly
index 17f3476,701962d..a300a51
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@@ -68,9 -72,9 +72,9 @@@ GO_VER=1.4.
  ## 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.9.0.4-fx+fn+sm.xpi
 +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.10-sm+fx+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
+ CCTOOLS_PACKAGE=cctools.tar.gz
  OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
  OSXSDK_OLD_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
  MSVCR100_PACKAGE=msvcr100.dll
@@@ -98,9 -102,9 +102,9 @@@ OPENSSL_HASH=e7e81d82f3cd538ab0cdba4940
  GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
  OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
  OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
- TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
  TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 +NOSCRIPT_HASH=9861b1e0bf5d12f773f4b26c3268d4257c3dc47a27b732ad4c280cd34bf45dd8
+ CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 -NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5
  MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
  PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
  ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4