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

[gk at torproject.org]

commit 7df52e4294bcb0fff50c34bffe7aca38a9b88b61
Merge: e1623db a6208dc
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Apr 17 12:29:21 2014 +0000

    Merge remote-tracking branch 'kpdyer/master'

 gitian/versions         |    2 +-
 gitian/versions.alpha   |    2 +-
 gitian/versions.beta    |    2 +-
 gitian/versions.nightly |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --cc gitian/versions.nightly
index 79930f7,c2d2997..1869182
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@@ -16,10 -16,9 +16,10 @@@ ZLIB_TAG=v1.2.
  LIBEVENT_TAG=release-2.0.21-stable
  MINGW_REV=6184
  PYPTLIB_TAG=master
 -OBFSPROXY_TAG=master
 +# Hardcoding this commit until #11535 is fixed
 +OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0
  FLASHPROXY_TAG=master
- FTEPROXY_TAG=master
+ FTEPROXY_TAG=0.2.13
  LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
  
  GITIAN_TAG=tor-browser-builder-3.x-5