[tbb-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'yawning/bug12535'

commit 5e26066db070aa30d879a022237478a37bb5d944 Merge: 474bbb5 9d26e00 Author: Georg Koppen gk@torproject.org Date: Mon Mar 23 08:46:50 2015 +0000

Merge remote-tracking branch 'yawning/bug12535'

.../linux/gitian-pluggable-transports.yml | 6 + .../mac/gitian-pluggable-transports.yml | 6 + .../windows/gitian-pluggable-transports.yml | 6 + gitian/patches/bug12535.patch | 1032 ++++++++++++++++++++ 4 files changed, 1050 insertions(+)