[tor-commits] [tor-browser-bundle/master] Merge remote-tracking branch 'gk/bug_12903_squashed_v3'

[mikeperry at torproject.org]

commit 104bd981bfb47563d3eb8c28069a1d87deea03ed
Merge: 875f231 0a916fb
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Oct 28 15:40:50 2014 -0700

    Merge remote-tracking branch 'gk/bug_12903_squashed_v3'

 .../Docs/Licenses/PluggableTransports/LICENSE      |   77 +++++++++++++++++---
 Bundle-Data/PTConfigs/bridge_prefs.js              |    4 +
 .../PTConfigs/linux/torrc-defaults-appendix        |    6 +-
 Bundle-Data/PTConfigs/mac/torrc-defaults-appendix  |    5 +-
 .../PTConfigs/windows/torrc-defaults-appendix      |    5 +-
 .../linux/gitian-pluggable-transports.yml          |   54 ++++++++++++++
 .../mac/gitian-pluggable-transports.yml            |   54 ++++++++++++++
 .../windows/gitian-pluggable-transports.yml        |   54 ++++++++++++++
 gitian/fetch-inputs.sh                             |   17 ++++-
 gitian/gpg/obfs4proxy.gpg                          |  Bin 0 -> 34128 bytes
 gitian/mkbundle-linux.sh                           |    3 +-
 gitian/mkbundle-mac.sh                             |    3 +-
 gitian/mkbundle-windows.sh                         |    3 +-
 gitian/verify-tags.sh                              |    5 +-
 gitian/versions.alpha                              |    9 +++
 gitian/versions.nightly                            |    9 +++
 16 files changed, 291 insertions(+), 17 deletions(-)