commit 0ca8d445690515e053e3dfbdaaf3b683b1021431 Merge: 5401e06 28e1585 Author: Georg Koppen gk@torproject.org Date: Tue Jan 13 15:09:56 2015 +0000

Merge remote-tracking branch 'boklm/ticket_13015_v2'

gitian/check-match.sh | 25 +++++++++++---------- gitian/get-tb-version | 53 ++++++++++++++++++++++++++++++++++++++++++++ gitian/hash-bundles.sh | 3 ++- gitian/mkbundle-linux.sh | 18 ++++++++++----- gitian/mkbundle-mac.sh | 12 ++++++++-- gitian/mkbundle-windows.sh | 16 +++++++++---- gitian/upload-signature.sh | 17 +++++++------- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 3 +++ 11 files changed, 118 insertions(+), 35 deletions(-)