commit b1a683d04ffd9054e2807013c5bc35fed8604b20 Merge: a73cdf8 713cf60 Author: Georg Koppen gk@torproject.org Date: Tue Apr 21 08:33:10 2015 +0000

Merge branch 'bug_15689_v3'

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/gpg/https-everywhere.gpg | Bin 83382 -> 112546 bytes gitian/verify-tags.sh | 4 ++-- gitian/versions | 6 +----- gitian/versions.alpha | 6 +----- gitian/versions.beta | 6 +----- gitian/versions.nightly | 4 ---- 10 files changed, 30 insertions(+), 45 deletions(-)