commit f1783ba6746b9facbd35273d665cd48a36eb9c2f Merge: c57e340 e35d7c0 Author: Georg Koppen gk@torproject.org Date: Tue Jun 16 11:53:17 2015 +0000

Merge branch 'bug_16150_v2'

gitian/descriptors/linux/gitian-firefox.yml | 4 +- .../linux/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/linux/gitian-tor.yml | 2 +- gitian/descriptors/linux/gitian-utils.yml | 6 +-- gitian/descriptors/mac/gitian-firefox.yml | 4 +- .../mac/gitian-pluggable-transports.yml | 40 +++++++++---------- gitian/descriptors/mac/gitian-tor.yml | 2 +- gitian/descriptors/mac/gitian-utils.yml | 6 +-- gitian/descriptors/windows/gitian-firefox.yml | 4 +- .../windows/gitian-pluggable-transports.yml | 42 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 ++--- 12 files changed, 81 insertions(+), 81 deletions(-)