commit 3a8088e99b4e2d2a0bdac24b42c2cd285079cee0 Merge: ee481a3 e487b6f Author: Mike Perry mikeperry-git@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(+)