[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'brade/bug16937-01'

[mikeperry at torproject.org]

commit 1288790242194bbd7b98d16dbe815c25703eac3d
Merge: 41adead 2029ea7
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Sep 15 20:54:16 2015 -0700

    Merge remote-tracking branch 'brade/bug16937-01'

 gitian/descriptors/linux/gitian-bundle.yml   |    4 +++-
 gitian/descriptors/mac/gitian-bundle.yml     |    5 +++--
 gitian/descriptors/windows/gitian-bundle.yml |    4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)