commit c268ca1dab6a1dbcd106da29c47390c9d834b420 Merge: 0119a3c 092dbbf Author: Georg Koppen gk@torproject.org Date: Wed Feb 18 13:33:50 2015 +0000

Merge branch 'bug14919'

Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 5 +---- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 5 +---- gitian/descriptors/linux/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/mac/gitian-pluggable-transports.yml | 12 ------------ gitian/descriptors/windows/gitian-pluggable-transports.yml | 12 ------------ gitian/fetch-inputs.sh | 5 ++--- gitian/verify-tags.sh | 2 +- gitian/versions.alpha | 5 +---- gitian/versions.nightly | 3 --- 10 files changed, 7 insertions(+), 59 deletions(-)