Bundle-Data/PTConfigs/linux/meek-browser-helper-linux.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# meek-browser-helper program for Tor Browser on Linux
+
+# Unset environment variables that Firefox sets after a restart (as
+# caused by, for example, an update or the installation of an add-on).
+# XRE_PROFILE_PATH, in particular, overrides the -profile option that
+# runFirefox sets, causing Firefox to run with profile.default instead
+# of profile.meek-http-helper, which conflicts with the profile.default
+# that is already running. See
+# https://trac.torproject.org/projects/tor/ticket/13247, particularly
+# #comment:17 and #comment:18. The environment variable names come from
+# https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppRunner.cpp#l3941
+unset XRE_PROFILE_PATH XRE_PROFILE_LOCAL_PATH XRE_PROFILE_NAME XRE_START_OFFLINE NO_EM_RESTART XUL_APP_FILE XRE_BINARY_PATH
+
+exec "./firefox" \
+  -no-remote -profile "TorBrowser/Data/Browser/profile.meek-http-helper"

Bundle-Data/PTConfigs/linux/torrc-defaults-appendix

@@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser/Tor/Plugg
 ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000
 
 ## meek configuration
-ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-torbrowser -- ./TorBrowser/Tor/PluggableTransports/meek-client
+ClientTransportPlugin meek exec ./TorBrowser/Tor/PluggableTransports/meek-client-wrapper --helper ./TorBrowser/Tor/PluggableTransports/meek-browser-helper-linux.sh -- ./TorBrowser/Tor/PluggableTransports/meek-client

Bundle-Data/PTConfigs/mac/meek-browser-helper-mac.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# meek-browser-helper program for Tor Browser on Mac OS X
+
+# Unset environment variables that Firefox sets after a restart (as
+# caused by, for example, an update or the installation of an add-on).
+# XRE_PROFILE_PATH, in particular, overrides the -profile option that
+# runFirefox sets, causing Firefox to run with profile.default instead
+# of profile.meek-http-helper, which conflicts with the profile.default
+# that is already running. See
+# https://trac.torproject.org/projects/tor/ticket/13247, particularly
+# #comment:17 and #comment:18. The environment variable names come from
+# https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppRunner.cpp#l3941
+unset XRE_PROFILE_PATH XRE_PROFILE_LOCAL_PATH XRE_PROFILE_NAME XRE_START_OFFLINE NO_EM_RESTART XUL_APP_FILE XRE_BINARY_PATH
+
+# Mac OS X needs an absolute profile path.
+# https://bugzilla.mozilla.org/show_bug.cgi?id=673955
+exec "PluggableTransports/TorBrowser.app.meek-http-helper/Contents/MacOS/firefox" \
+  -no-remote -profile "$(dirname "$(pwd -P)")/Data/Browser/profile.meek-http-helper"

Bundle-Data/PTConfigs/mac/torrc-defaults-appendix

@@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/ob
 ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000
 
 ## meek configuration
-ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client
+ClientTransportPlugin meek exec PluggableTransports/meek-client-wrapper --helper PluggableTransports/meek-browser-helper-mac.sh -- PluggableTransports/meek-client

Bundle-Data/PTConfigs/windows/torbrowser-windows.meek-browser-helper

@@ -0,0 +1,23 @@
+# meek-browser-helper program for Tor Browser on Windows
+
+# Unset environment variables that Firefox sets after a restart (as
+# caused by, for example, an update or the installation of an add-on).
+# XRE_PROFILE_PATH, in particular, overrides the -profile option that
+# runFirefox sets, causing Firefox to run with profile.default instead
+# of profile.meek-http-helper, which conflicts with the profile.default
+# that is already running. See
+# https://trac.torproject.org/projects/tor/ticket/13247, particularly
+# #comment:17 and #comment:18. The environment variable names come from
+# https://hg.mozilla.org/mozilla-central/file/cfde3603b020/toolkit/xre/nsAppRunner.cpp#l3941
+XRE_PROFILE_PATH=
+XRE_PROFILE_LOCAL_PATH=
+XRE_PROFILE_NAME=
+XRE_START_OFFLINE=
+NO_EM_RESTART=
+XUL_APP_FILE=
+XRE_BINARY_PATH=
+
+./firefox.exe
+-no-remote
+-profile
+TorBrowser/Data/Browser/profile.meek-http-helper

Bundle-Data/PTConfigs/windows/torrc-defaults-appendix

@@ -1,15 +1,15 @@
-## fteproxy configuration
-ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed
-
-## obfs4proxy configuration
-ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy
-
-## flash proxy configuration
-#
-# Change the second number here (9000) to the number of a port that can
-# receive connections from the Internet (the port for which you
-# configured port forwarding).
-ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000
-
-## meek configuration
-ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client
+## fteproxy configuration
+ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed
+
+## obfs4proxy configuration
+ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\PluggableTransports\obfs4proxy
+
+## flash proxy configuration
+#
+# Change the second number here (9000) to the number of a port that can
+# receive connections from the Internet (the port for which you
+# configured port forwarding).
+ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000
+
+## meek configuration
+ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-wrapper --helper TorBrowser\Tor\PluggableTransports\meek-browser-helper-windows.bat -- TorBrowser\Tor\PluggableTransports\meek-client

gitian/descriptors/linux/gitian-bundle.yml

@@ -22,7 +22,7 @@ remotes:
   "dir": "torbutton"
 - "url": "https://git.torproject.org/https-everywhere.git"
   "dir": "https-everywhere"
-- "url": "https://git.torproject.org/pluggable-transports/meek.git"
+- "url": "https://github.com/infinity0/meek.git"
   "dir": "meek"
 - "url": "https://github.com/googlei18n/noto-fonts.git"
   "dir": "noto-fonts"
@@ -41,6 +41,7 @@ files:
 - "torrc-defaults-appendix-linux"
 - "bridge_prefs.js"
 - "meek-http-helper-user.js"
+- "meek-browser-helper-linux.sh"
 - "relativelink-src.zip"
 - "linux-skeleton.zip"
 - "linux-langpacks.zip"
@@ -148,6 +149,7 @@ script: |
     cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults
     cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js
     cat ~/build/meek-http-helper-user.js >> Data/Browser/profile.meek-http-helper/user.js
+    cp ~/build/meek-browser-helper-linux.sh Tor/PluggableTransports/
   fi
   chmod 700 Data/Browser
   chmod 700 Data/Tor

gitian/descriptors/linux/gitian-pluggable-transports.yml

@@ -30,7 +30,7 @@ remotes:
   "dir": "txsocksx"
 - "url": "https://git.torproject.org/pluggable-transports/goptlib.git"
   "dir": "goptlib"
-- "url": "https://git.torproject.org/pluggable-transports/meek.git"
+- "url": "https://github.com/infinity0/meek.git"
   "dir": "meek"
 - "url": "https://github.com/agl/ed25519.git"
   "dir": "ed25519"
@@ -220,9 +220,9 @@ script: |
   go build -ldflags '-s'
   cp -a meek-client $PTDIR
   cd ..
-  cd meek-client-torbrowser
+  cd meek-client-wrapper
   go build -ldflags '-s'
-  cp -a meek-client-torbrowser $PTDIR
+  cp -a meek-client-wrapper $PTDIR
   cd ..
   mkdir -p $INSTDIR/Docs/meek
   cp -a README doc/*.1 $INSTDIR/Docs/meek

gitian/descriptors/mac/gitian-bundle.yml

@@ -28,7 +28,7 @@ remotes:
   "dir": "https-everywhere"
 - "url": "https://github.com/vasi/libdmg-hfsplus.git"
   "dir": "libdmg-hfsplus"
-- "url": "https://git.torproject.org/pluggable-transports/meek.git"
+- "url": "https://github.com/infinity0/meek.git"
   "dir": "meek"
 - "url": "https://github.com/googlei18n/noto-fonts.git"
   "dir": "noto-fonts"
@@ -40,6 +40,7 @@ files:
 - "torrc-defaults-appendix-mac"
 - "bridge_prefs.js"
 - "meek-http-helper-user.js"
+- "meek-browser-helper-mac.sh"
 - "TorBrowser.app.meek-http-helper.zip"
 - "mac-skeleton.zip"
 - "dmg-applications.tar.xz"
@@ -146,6 +147,7 @@ script: |
     cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults
     cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js
     cat ~/build/meek-http-helper-user.js >> Data/Browser/profile.meek-http-helper/user.js
+    cp ~/build/meek-browser-helper-mac.sh Tor/PluggableTransports/
   fi
   # Install a "tor" shim that sets the working directory. See #10030.
   mv Tor/tor Tor/tor.real

gitian/descriptors/mac/gitian-pluggable-transports.yml

@@ -28,7 +28,7 @@ remotes:
   "dir": "txsocksx"
 - "url": "https://git.torproject.org/pluggable-transports/goptlib.git"
   "dir": "goptlib"
-- "url": "https://git.torproject.org/pluggable-transports/meek.git"
+- "url": "https://github.com/infinity0/meek.git"
   "dir": "meek"
 - "url": "https://github.com/agl/ed25519.git"
   "dir": "ed25519"
@@ -248,9 +248,9 @@ script: |
   go build -ldflags '-s'
   cp -a meek-client $PTDIR
   cd ..
-  cd meek-client-torbrowser
+  cd meek-client-wrapper
   go build -ldflags '-s'
-  cp -a meek-client-torbrowser $PTDIR
+  cp -a meek-client-wrapper $PTDIR
   cd ..
   mkdir -p $TBDIR/Docs/meek
   cp -a README doc/*.1 $TBDIR/Docs/meek

gitian/descriptors/windows/gitian-bundle.yml

@@ -27,7 +27,7 @@ remotes:
   "dir": "torbutton"
 - "url": "https://git.torproject.org/https-everywhere.git"
   "dir": "https-everywhere"
-- "url": "https://git.torproject.org/pluggable-transports/meek.git"
+- "url": "https://github.com/infinity0/meek.git"
   "dir": "meek"
 - "url": "https://github.com/googlei18n/noto-fonts.git"
   "dir": "noto-fonts"
@@ -39,6 +39,8 @@ files:
 - "torrc-defaults-appendix-windows"
 - "bridge_prefs.js"
 - "meek-http-helper-user.js"
+- "meek-browser-helper-windows.bat"
+- "meek-browser-helper-windows.js"
 - "windows-skeleton.zip"
 - "win32-langpacks.zip"
 - "noscript@noscript.net.xpi"
@@ -134,6 +136,8 @@ script: |
     cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults
     cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js
     cat ~/build/meek-http-helper-user.js >> Data/Browser/profile.meek-http-helper/user.js
+    cp ~/build/meek-browser-helper-windows.bat Tor/PluggableTransports/
+    cp ~/build/meek-browser-helper-windows.js Tor/PluggableTransports/
   fi
   cd ../../..
   #

gitian/descriptors/windows/gitian-pluggable-transports.yml

@@ -27,7 +27,7 @@ remotes:
   "dir": "txsocksx"
 - "url": "https://git.torproject.org/pluggable-transports/goptlib.git"
   "dir": "goptlib"
-- "url": "https://git.torproject.org/pluggable-transports/meek.git"
+- "url": "https://github.com/infinity0/meek.git"
   "dir": "meek"
 - "url": "https://github.com/agl/ed25519.git"
   "dir": "ed25519"
@@ -322,9 +322,9 @@ script: |
   go build -ldflags '-s'
   cp -a meek-client.exe $PTDIR
   cd ..
-  cd meek-client-torbrowser
+  cd meek-client-wrapper
   go build -ldflags '-s'
-  cp -a meek-client-torbrowser.exe $PTDIR
+  cp -a meek-client-wrapper.exe $PTDIR
   cd ..
   cd terminateprocess-buffer
   go build -ldflags '-s'

gitian/fetch-inputs.sh

@@ -271,7 +271,7 @@ fteproxy              https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG
 libdmg-hfsplus        https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG
 txsocksx              https://github.com/habnabit/txsocksx.git $TXSOCKSX_TAG
 goptlib               https://git.torproject.org/pluggable-transports/goptlib.git $GOPTLIB_TAG
-meek                  https://git.torproject.org/pluggable-transports/meek.git $MEEK_TAG
+meek                  https://github.com/infinity0/meek.git $MEEK_TAG
 faketime              https://github.com/wolfcw/libfaketime $FAKETIME_TAG
 ed25519               https://github.com/agl/ed25519.git $GOED25519_TAG
 siphash               https://github.com/dchest/siphash.git $GOSIPHASH_TAG

gitian/mkbundle-linux.sh

@@ -58,6 +58,7 @@ cd ./Bundle-Data/
 rm -f $GITIAN_DIR/inputs/tbb-docs.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 cp PTConfigs/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux
+cp PTConfigs/linux/meek-browser-helper-linux.sh $GITIAN_DIR/inputs/
 cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 

gitian/mkbundle-mac.sh

@@ -56,6 +56,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 rm -f $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip
 (cd PTConfigs/mac && $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/TorBrowser.app.meek-http-helper.zip TorBrowser.app.meek-http-helper)
 cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac
+cp PTConfigs/mac/meek-browser-helper-mac.sh $GITIAN_DIR/inputs/
 cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 cp mac-tor.sh $GITIAN_DIR/inputs/

gitian/mkbundle-windows.sh

@@ -55,6 +55,8 @@ cd $WRAPPER_DIR/../Bundle-Data/
 rm -f $GITIAN_DIR/inputs/tbb-docs.zip
 $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/
 cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows
+cp PTConfigs/windows/meek-browser-helper-windows.bat $GITIAN_DIR/inputs/
+cp PTConfigs/windows/meek-browser-helper-windows.js $GITIAN_DIR/inputs/
 cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/
 cp PTConfigs/meek-http-helper-user.js $GITIAN_DIR/inputs/
 

gitian/versions.alpha

@@ -5,7 +5,7 @@ BUNDLE_LOCALES_WIN32="ja"
 BUNDLE_LOCALES_MAC="ja-JP-mac"
 BUILD_PT_BUNDLES=1
 
-VERIFY_TAGS=1
+VERIFY_TAGS=0
 
 FIREFOX_VERSION=38.3.0esr
 
@@ -28,7 +28,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2
 GOPTLIB_TAG=0.2
-MEEK_TAG=0.20
+MEEK_TAG=43a35d32717bb09447b426e0f7e4e5b7b913ba6e
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd