Bug 11629: Merge changes due to fteproxy 0.2.14.
Merge remote-tracking branch 'tbb/master'

Conflicts:
	gitian/descriptors/mac/gitian-pluggable-transports.yml
	gitian/versions
	gitian/versions.beta
Merge branch 'master' of github.com:kpdyer/tor-browser-bundle