March 2014 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-24.4.0esr-1] Add security enhancements suggested by Jesse Ruderman.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit 8896b493c0487ac7402514257d6e4acdde00ff64 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 23:58:04 2014 -0700 Add security enhancements suggested by Jesse Ruderman. We were going to put these in the security slider, but perhaps they should be set by default. There will be a perf impact, but let's see if anyone notices and complains, at least for a beta or two. If not, maybe we can even set these in a release. --- browser/app/profile/000-tor-browser.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7e2efc9..91f8697 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -140,5 +140,13 @@ pref("keyword.URL", "https://startpage.com/do/search?q="); pref("gfx.direct2d.disabled", true); pref("layers.acceleration.disabled", true); +// Security enhancements +// https://trac.torproject.org/projects/tor/ticket/9387#comment:17 +pref("javascript.options.ion.content", false); +pref("javascripjavascript.options.baselinejit.content", false); +pref("javascripjavascript.options.asmjs", false); +pref("javascripjavascript.options.typeinference", false); + + // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-browser-bundle/master] Add tools directory with scripts for nightly builds.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit 784bac5f84c7b4b02e11e74070d57c944d1dc291 Author: Linus Nordberg <linus(a)nordberg.se> Date: Sat Mar 15 16:42:50 2014 +0100 Add tools directory with scripts for nightly builds. --- tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 48 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 42 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 115 insertions(+) diff --git a/tools/continuous-builds/README b/tools/continuous-builds/README new file mode 100644 index 0000000..c60f19f --- /dev/null +++ b/tools/continuous-builds/README @@ -0,0 +1,14 @@ +Nightly builds can be produced and uploaded to a publishing host by +running build-tbb.sh. The checkout-tbb.sh script can be used to check +out the latest master before starting a build. + +The publishing host should handle uploaded tar file using the +park-nightly.sh script through the command option in sshd's +AuthorizedKeysFile. + + command="[ $(hostname) = perdulce ] && ~/park-nightly.sh",no-pty ssh-rsa ... + +In order to not grow the disk usage too much on the publishing host, +the following script can be run by cron: +https://github.com/boklm/prune-old-builds. + diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh new file mode 100755 index 0000000..c44e0fd --- /dev/null +++ b/tools/continuous-builds/build-tbb.sh @@ -0,0 +1,48 @@ +#! /bin/sh +# usage: +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# +# Build TARGET in BUILDDIR, which will end up in DESTDIR +# Try doing it N times. +# Upload result to PUBLISH-HOST using SSH key PUBLISH-KEY. + +# TODO: +# - if there's no new commits, don't build but make sure there's a symlink on perdulce + +TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly +PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org +PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian +DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET +N=$6; [ -z "$N" ] && N=16 + +logfile=$(date -u +%s).log + +. ~/setup-gitian-build-env.sh +cd $BUILDDIR || exit 1 +status=init +n=0 +while [ $status != done ]; do + n=$(expr $n + 1) + printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile + date | tee -a $logfile + killall qemu-system-i386 qemu-system-x86_64 + make $TARGET > build-$(date -u +%s).log && status=done + printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + TARGET=build-nightly + [ $n -ge $N ] && break +done + +if [ $status = done ]; then + NEWDESTDIR=$DESTDIR-$(date +%F) + echo "$0: renaming $DESTDIR -> $NEWDESTDIR" | tee -a $logfile + mv $DESTDIR $NEWDESTDIR + cd $NEWDESTDIR || exit 3 + sha256sum *.tar.xz *.zip *.exe > sha256sums.txt + gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + cd .. + D=$(basename $NEWDESTDIR) + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile +else + echo "$0: giving up after $n tries" | tee -a $logfile +fi diff --git a/tools/continuous-builds/checkout-tbb.sh b/tools/continuous-builds/checkout-tbb.sh new file mode 100755 index 0000000..f8a7929 --- /dev/null +++ b/tools/continuous-builds/checkout-tbb.sh @@ -0,0 +1,8 @@ +#! /bin/sh + +BUILDDIR=$1 +[ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian + +cd $BUILDDIR || exit 1 +git checkout master +git pull diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh new file mode 100755 index 0000000..1ac5b2c --- /dev/null +++ b/tools/continuous-builds/park-nightly.sh @@ -0,0 +1,42 @@ +#! /bin/sh +# usage: park-nightly.sh [DIR] + +V=1 #debug is enabled by default for now + +if [ "$1" = "-v" ]; then + V=1 + shift +fi + +DIR=$1 +[ -z "$DIR" ] && DIR=~/public_html/builds + +DSTDIR=tbb-nightly-$(date +%F) +[ -z "$V" ] || echo "Aiming to fill up $DSTDIR" + +do_check() { + [ -z "$1" ] || cd $1 || exit 5 + [ -z "$V" ] || echo "Verifying sha256sums.txt" + gpg -q --verify sha256sums.txt.asc > /dev/null || exit 3 + [ -z "$V" ] || echo "Checking sha256sums.txt" + sha256sum --strict --quiet -c sha256sums.txt || exit 4 +} + +if [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ]; then + [ -z "$V" ] || echo "Files already here, just doing the checking" + do_check $DIR/$DSTDIR + exit +fi + +[ -d .staging ] || mkdir .staging +chmod 700 .staging; cd .staging +[ -z "$V" ] || echo "Saving files to disk" +TAROPT=x +[ -z "$V" ] || TAROPT=${TAROPT}v +tar $TAROPT -f - || exit 6 +touch $DSTDIR/tbb-nightly.stamp + +do_check $DSTDIR || exit 2 +[ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR +cd ..; mv $DSTDIR $DIR/ || exit 1 +[ -z "$V" ] || echo "All good, all good" diff --git a/tools/continuous-builds/setup-gitian-build-env.sh b/tools/continuous-builds/setup-gitian-build-env.sh new file mode 100644 index 0000000..e9f435a --- /dev/null +++ b/tools/continuous-builds/setup-gitian-build-env.sh @@ -0,0 +1,3 @@ +# source me! +export LC_ALL=C +export NUM_PROCS=10

1 0

[tor-browser-bundle/master] Use an environment variable for selecting PGP key to sign with.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit c8fe0baedb139b4798dc484e993b417a2bb1ab0f Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:22:21 2014 +0100 Use an environment variable for selecting PGP key to sign with. --- tools/continuous-builds/build-tbb.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index c44e0fd..3ae1c92 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -1,6 +1,6 @@ #! /bin/sh # usage: -# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-KEY [BUILDDIR [DESTDIR [N]]]]]] +# build-tbb.sh [TARGET [PUBLISH-HOST [PUBLISH-SSH-KEY [BUILDDIR [DESTDIR [N]]]]]] # # Build TARGET in BUILDDIR, which will end up in DESTDIR # Try doing it N times. @@ -8,14 +8,17 @@ # TODO: # - if there's no new commits, don't build but make sure there's a symlink on perdulce +# - copy build logs to publish-host, at least when failing the build TARGET=$1; [ -z "$TARGET" ] && TARGET=nightly PUBLISH_HOST=$2; [ -z "$PUBLISH_HOST" ] && PUBLISH_HOST=perdulce.torproject.org -PUBLISH_KEY=$3; [ -z "$PUBLISH_KEY" ] && PUBLISH_KEY=~/.ssh/perdulce-upload +PUBLISH_SSH_KEY=$3; [ -z "$PUBLISH_SSH_KEY" ] && PUBLISH_SSH_KEY=~/.ssh/perdulce-upload BUILDDIR=$4; [ -z "$BUILDDIR" ] && BUILDDIR=~/usr/src/tor-browser-bundle/gitian DESTDIR=$5; [ -z "$DESTDIR" ] && DESTDIR=$BUILDDIR/tbb-$TARGET N=$6; [ -z "$N" ] && N=16 +[ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 + logfile=$(date -u +%s).log . ~/setup-gitian-build-env.sh @@ -39,10 +42,10 @@ if [ $status = done ]; then mv $DESTDIR $NEWDESTDIR cd $NEWDESTDIR || exit 3 sha256sum *.tar.xz *.zip *.exe > sha256sums.txt - gpg -a --clearsign --local-user 0x984496E7 sha256sums.txt || exit 2 + gpg -a --clearsign --local-user $PGPKEYID sha256sums.txt || exit 2 cd .. D=$(basename $NEWDESTDIR) - tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_KEY $PUBLISH_HOST | tee -a $logfile + tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile fi

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'linus/tools'
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit ce74f8c3a85927cb70d2f5c1dc61a445662e9c1b Merge: 9dbf4b4 f7a5306 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:13:23 2014 -0700 Merge remote-tracking branch 'linus/tools' tools/continuous-builds/README | 14 ++++++ tools/continuous-builds/build-tbb.sh | 51 +++++++++++++++++++++ tools/continuous-builds/checkout-tbb.sh | 8 ++++ tools/continuous-builds/park-nightly.sh | 44 ++++++++++++++++++ tools/continuous-builds/setup-gitian-build-env.sh | 3 ++ 5 files changed, 120 insertions(+)

1 0

[tor-browser-bundle/master] Invoke prune-old-builds on success.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit f7a5306138e27cc2971ac263178ba15eb980ca6a Author: Linus Nordberg <linus(a)nordberg.se> Date: Tue Mar 25 17:27:44 2014 +0100 Invoke prune-old-builds on success. --- tools/continuous-builds/park-nightly.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/continuous-builds/park-nightly.sh b/tools/continuous-builds/park-nightly.sh index 1ac5b2c..dbc01e4 100755 --- a/tools/continuous-builds/park-nightly.sh +++ b/tools/continuous-builds/park-nightly.sh @@ -40,3 +40,5 @@ do_check $DSTDIR || exit 2 [ -d $DIR/$DSTDIR ] && [ -e $DIR/$DSTDIR/tbb-nightly.stamp ] && rm -rf $DIR/$DSTDIR cd ..; mv $DSTDIR $DIR/ || exit 1 [ -z "$V" ] || echo "All good, all good" + +[ -x ~/usr/bin/prune-old-builds ] && ~/usr/bin/prune-old-builds ~/public_html/builds

1 0

[tor-browser-bundle/master] Use a TORSOCKS make variable.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit 93a1c3135730f10575e6a0aa368bedd087cb4618 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 24 14:47:28 2014 -0700 Use a TORSOCKS make variable. This allows you to selectively disable torsocks from the command line using a command like make prep TORSOCKS= --- gitian/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gitian/Makefile b/gitian/Makefile index e483735..cec338d 100644 --- a/gitian/Makefile +++ b/gitian/Makefile @@ -1,3 +1,5 @@ +TORSOCKS = torsocks + all: clean prep build nightly: clean prep-nightly build-nightly @@ -31,32 +33,32 @@ build-beta: ./hash-bundles.sh versions.beta sign: - torsocks ./upload-signature.sh versions + $(TORSOCKS) ./upload-signature.sh versions sign-alpha: - torsocks ./upload-signature.sh versions.alpha + $(TORSOCKS) ./upload-signature.sh versions.alpha sign-nightly: ./upload-signature.sh versions.nightly sign-beta: - torsocks ./upload-signature.sh versions.beta + $(TORSOCKS) ./upload-signature.sh versions.beta match: - torsocks ./check-match.sh versions + $(TORSOCKS) ./check-match.sh versions match-nightly: ./check-match.sh versions.nightly match-alpha: - torsocks ./check-match.sh versions.alpha + $(TORSOCKS) ./check-match.sh versions.alpha match-beta: - torsocks ./check-match.sh versions.beta + $(TORSOCKS) ./check-match.sh versions.beta prep: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions prep-nightly: ./check-prerequisites.sh @@ -64,11 +66,11 @@ prep-nightly: prep-alpha: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.alpha prep-beta: ./check-prerequisites.sh - torsocks ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta + $(TORSOCKS) ./fetch-inputs.sh ../../gitian-builder/inputs/ versions.beta clean: rm -f ../../gitian-builder/inputs/*gbuilt*

1 0

[tor-browser-bundle/master] Document the TORSOCKS make variable.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit 9dbf4b46d11d0fd28567f31c7e5247729d62ac48 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:09:19 2014 -0700 Document the TORSOCKS make variable. --- gitian/README.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gitian/README.build b/gitian/README.build index f9672d8..ece4cb6 100644 --- a/gitian/README.build +++ b/gitian/README.build @@ -16,9 +16,10 @@ QuickStart: $ make match By default, the Makefile wraps input downloads in 'torsocks'. This is done - to allow unofficial secret verifiers to remain secret by default. Removing - the 'torsocks' from the 'prep' Makefile rule should be sufficient to avoid - using Tor. + to allow unofficial secret verifiers to remain secret by default. To download + inputs without torsocks, run: + + $ make TORSOCKS= By default, 'make' will also clear out any previous partial builds. See the "Partial Rebuilds" section for information on performing partial rebuilds

1 0

[tor-browser-bundle/master] Use multiple flashproxy bridge lines.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit e535fe31cd518ab44f8cdf0785316bd39b962bc5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Mar 17 06:27:08 2014 +0000 Use multiple flashproxy bridge lines. In https://trac.torproject.org/projects/tor/ticket/10429#comment:2 we got a bit better reliability with more bridge lines. This doesn't cause flashproxy-client to send more registration methods, but it does hint to tor that if a bridge is being slow or unreliable it can try connecting again to get another. The corresponding change in the flashproxy repo is https://gitweb.torproject.org/flashproxy.git/commitdiff/51bdfe59cad37a5f2ff…. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 9a3dfc2..47d20e8 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -11,6 +11,10 @@ pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:389 pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); +pref("extensions.torlauncher.default_bridge.flashproxy.2", "flashproxy 0.0.1.0:2"); +pref("extensions.torlauncher.default_bridge.flashproxy.3", "flashproxy 0.0.1.0:3"); +pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy 0.0.1.0:4"); +pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy 0.0.1.0:5"); pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73");

1 0

[tor-browser-bundle/master] Bug 11200: Prevent spurious error message prior to enabling network.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit 20b1a0c82f3d29b6d23f1de3e55a18ff74f54dcf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 21:51:32 2014 -0700 Bug 11200: Prevent spurious error message prior to enabling network. --- gitian/descriptors/linux/gitian-tor.yml | 2 ++ gitian/descriptors/mac/gitian-tor.yml | 2 ++ gitian/descriptors/windows/gitian-tor.yml | 5 +++- gitian/patches/bug11200.patch | 39 +++++++++++++++++++++++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 73181a0..bb795c0 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug9229.patch" - "bug11156.patch" - "bug11069.patch" +- "bug11200.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -95,6 +96,7 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug11200.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 8b049b0..129a3fe 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -29,6 +29,7 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" +- "bug11200.patch" - "bug11069.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -106,6 +107,7 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch + git am ~/build/bug11200.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 3d05eaa..5cceac9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug5018.patch" - "bug9229.patch" - "bug11156.patch" +- "bug11200.patch" - "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" @@ -102,7 +103,9 @@ script: | git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - fi fi + git am ~/build/bug11200.patch + fi + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11200.patch b/gitian/patches/bug11200.patch new file mode 100644 index 0000000..040309a --- /dev/null +++ b/gitian/patches/bug11200.patch @@ -0,0 +1,39 @@ +From 6770153d4ced726e54305ad38d14ea82df0d639e Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Sat, 29 Mar 2014 21:49:32 -0700 +Subject: [PATCH] should_disable_dir_fetches() now returns 1 if + DisableNetwork==1 + +This change prevents LD_BUG warnings and bootstrap failure messages +when we try to do directory fetches when starting with +DisableNetwork == 1, a consensus present, but no descriptors (or +insufficient descriptors) yet. + +Fixes bug 11200 and bug 10405. It's a bugfix on 0.2.3.9-alpha. +Thanks to mcs for walking me through the repro instructions! +--- + src/or/networkstatus.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c +index bcadc52..9a1824b 100644 +--- a/src/or/networkstatus.c ++++ b/src/or/networkstatus.c +@@ -1394,6 +1394,14 @@ should_delay_dir_fetches(const or_options_t *options, const char **msg_out) + *msg_out = NULL; + } + ++ if (options->DisableNetwork) { ++ if (msg_out) { ++ *msg_out = "DisableNetwork is set."; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (DisableNetwork is set)"); ++ return 1; ++ } ++ + if (options->UseBridges) { + if (!any_bridge_descriptors_known()) { + if (msg_out) { +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Fix up backport application so that nightlies contain unmerged patches.
by mikeperry＠torproject.org 29 Mar '14

29 Mar '14

commit 440b4c5d059acfa744f9c12c9e3b13f81bbc6140 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 29 22:02:13 2014 -0700 Fix up backport application so that nightlies contain unmerged patches. --- gitian/descriptors/linux/gitian-tor.yml | 4 ++-- gitian/descriptors/mac/gitian-tor.yml | 4 ++-- gitian/descriptors/windows/gitian-tor.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index bb795c0..698fcba 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -90,14 +90,14 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 129a3fe..30c23bb 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -101,14 +101,14 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 5cceac9..1698726 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -97,14 +97,14 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug9229.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch - git am ~/build/bug11200.patch fi + git am ~/build/bug11200.patch fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src

1 0