- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Switch the install shortcut location to /Applications.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 02d79a009b0a13d7e115d5f8c71e1298b4982ff9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 23:31:00 2014 -0800 Switch the install shortcut location to /Applications. Mac users still get lost by a default install location to Desktop.. :/ In case we decide to do more extensive A/B testing: Keep skeletons for both Desktop and Application DMG templates around. --- Bundle-Data/mac-applications.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-applications.dmg/.VolumeIcon.icns | Bin 0 -> 242224 bytes Bundle-Data/mac-applications.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 | Bin 0 -> 173 bytes Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 + Bundle-Data/mac-applications.dmg/Applications | 1 + Bundle-Data/mac-desktop.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-desktop.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac-desktop.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-desktop.dmg/Desktop | Bin 0 -> 300120 bytes Bundle-Data/mac.dmg/.DS_Store | Bin 12292 -> 0 bytes Bundle-Data/mac.dmg/._Desktop | Bin 303592 -> 0 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 50020 -> 0 bytes Bundle-Data/mac.dmg/Desktop | Bin 300120 -> 0 bytes gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/mkbundle-mac.sh | 9 ++++++--- 16 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/mac-applications.dmg/.DS_Store b/Bundle-Data/mac-applications.dmg/.DS_Store new file mode 100644 index 0000000..aeb3104 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns new file mode 100644 index 0000000..481914f Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ diff --git a/Bundle-Data/mac-applications.dmg/.background/background.png b/Bundle-Data/mac-applications.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 new file mode 100644 index 0000000..e21068d Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid new file mode 100644 index 0000000..538367d --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid @@ -0,0 +1 @@ +B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file diff --git a/Bundle-Data/mac-applications.dmg/Applications b/Bundle-Data/mac-applications.dmg/Applications new file mode 120000 index 0000000..bd2d47f --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/Applications @@ -0,0 +1 @@ +/Applications \ No newline at end of file diff --git a/Bundle-Data/mac-desktop.dmg/.DS_Store b/Bundle-Data/mac-desktop.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-desktop.dmg/._Desktop b/Bundle-Data/mac-desktop.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/._Desktop differ diff --git a/Bundle-Data/mac-desktop.dmg/.background/background.png b/Bundle-Data/mac-desktop.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-desktop.dmg/Desktop b/Bundle-Data/mac-desktop.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/Desktop differ diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store deleted file mode 100644 index 9bec18c..0000000 Binary files a/Bundle-Data/mac.dmg/.DS_Store and /dev/null differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop deleted file mode 100644 index a1e0b7f..0000000 Binary files a/Bundle-Data/mac.dmg/._Desktop and /dev/null differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/Bundle-Data/mac.dmg/.background/background.png and /dev/null differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop deleted file mode 100644 index 3c88450..0000000 Binary files a/Bundle-Data/mac.dmg/Desktop and /dev/null differ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 55a6777..4325a1b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -36,7 +36,8 @@ files: - "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" -- "mac-dmg.zip" +- "dmg-applications.tar.xz" +- "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" @@ -148,7 +149,7 @@ script: | make cd ../../ cd dmg - unzip ~/build/mac-dmg.zip + tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest? cd .. # # FF24 puts the prefs in the browser jar: diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 18e0f8a..a9cbacb 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -63,9 +63,12 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . -cd ../mac.dmg -rm -f $GITIAN_DIR/inputs/mac-dmg.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . +cd ../mac-desktop.dmg +rm -f $GITIAN_DIR/inputs/dmg-desktop.tar.xz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-desktop.tar.xz . +cd ../mac-applications.dmg +rm -f $GITIAN_DIR/inputs/dmg-applications.tar-gz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR

1 0

[tor-browser-bundle/master] Bug 11042: Remove Build-ID from Firefox libs.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 9c37c9fcc639c02e9dd7b81741bbf95a24f47a31 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:13:50 2014 -0800 Bug 11042: Remove Build-ID from Firefox libs. It is sometimes non-deterministic (particularly for libxul.so). --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3ee8eef..282ea49 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -100,6 +100,8 @@ script: | cd $INSTDIR for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater do + # Build-ID is sometimes non-deterministic, and we use debuglink anyway + objcopy --remove-section=.note.gnu.build-id $LIB objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB

1 0

[tor-browser-bundle/master] Set flag to build PT bundles for alpha and nightly.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 6ae73509c55eb0385b7dd0520fdee04ca3ad84e5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 13:54:45 2014 -0800 Set flag to build PT bundles for alpha and nightly. --- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 2 files changed, 2 insertions(+) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b6ee2c2..85ffd95 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,6 @@ TORBROWSER_VERSION=4.0-alpha-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 436536e..3288c7e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,5 +1,6 @@ TORBROWSER_VERSION=tbb-nightly BUNDLE_LOCALES="ar ru zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/master] Append bridge lines to PT bundles.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f29ec39f7bd73fcadf83f051c9add246e4d0c4f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:11:16 2014 -0800 Append bridge lines to PT bundles. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 3 ++- gitian/mkbundle-mac.sh | 3 ++- gitian/mkbundle-windows.sh | 3 ++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 36c2efc..3fa79cc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -31,6 +31,7 @@ files: - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" - "torrc-defaults-appendix-linux" +- "bridge_prefs.js" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -106,6 +107,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi chmod 700 Data/Browser chmod 700 Data/Tor diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index da7e918..63c0a96 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -33,6 +33,7 @@ files: - "tor-mac32-gbuilt.zip" - "pluggable-transports-mac32-gbuilt.zip" - "torrc-defaults-appendix-mac" +- "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-dmg.zip" @@ -125,6 +126,7 @@ script: | unzip ~/build/tbb-docs.zip if [ $BUILD_PT_BUNDLES ]; then cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 8cf2f05..c8b29c9 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -28,6 +28,7 @@ files: - "tor-win32-gbuilt.zip" - "pluggable-transports-win32-gbuilt.zip" - "torrc-defaults-appendix-windows" +- "bridge_prefs.js" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -108,6 +109,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-win32-gbuilt.zip cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi cd .. # diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 34485ae..b4e635d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel 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 beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d6bffce..18e0f8a 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel 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 beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 037b031..7ab0aa6 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -58,7 +58,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel 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 beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip

1 0

[tor-browser-bundle/master] Relocate bridges from torrc appendices to a prefs file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3279db32f147479af225d7106949e8dddd360dbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:02:10 2014 -0800 Relocate bridges from torrc appendices to a prefs file. --- Bundle-Data/beta/bridge_prefs.js | 15 ++++++++ Bundle-Data/beta/linux/torrc-defaults-appendix | 40 +++++----------------- Bundle-Data/beta/mac/torrc-defaults-appendix | 23 ------------- Bundle-Data/beta/windows/torrc-defaults-appendix | 22 ------------ 4 files changed, 23 insertions(+), 77 deletions(-) diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/beta/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); + +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index b43cd59..d0f621e 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,35 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# 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 ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## 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 ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index d3e211d..e1ada73 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,34 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # 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). diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 965b98a..049d2ff 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,33 +1,11 @@ ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # 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).

1 0

[tor-browser-bundle/master] Rename 'beta' to PTConfigs.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f8e7d91b4ed2e2d8f263b8b9898ce31ac28abfba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:04:36 2014 -0800 Rename 'beta' to PTConfigs. --- Bundle-Data/PTConfigs/bridge_prefs.js | 15 +++++++++++++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 11 +++++++++++ Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/beta/bridge_prefs.js | 15 --------------- Bundle-Data/beta/linux/torrc-defaults-appendix | 11 ----------- Bundle-Data/beta/mac/torrc-defaults-appendix | 12 ------------ Bundle-Data/beta/windows/torrc-defaults-appendix | 12 ------------ 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); + +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix new file mode 100644 index 0000000..d0f621e --- /dev/null +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -0,0 +1,11 @@ +## fteproxy configuration +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## 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 ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix new file mode 100644 index 0000000..e1ada73 --- /dev/null +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed + +## 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 PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix new file mode 100644 index 0000000..049d2ff --- /dev/null +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed + +## 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 Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js deleted file mode 100644 index e3d6b69..0000000 --- a/Bundle-Data/beta/bridge_prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -# Tor Launcher preferences (default bridges): -pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); - -// Default bridges. -pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); -pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); -pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); -pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); -pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); -pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); - -pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); - -pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix deleted file mode 100644 index d0f621e..0000000 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ /dev/null @@ -1,11 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed -## 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 ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix deleted file mode 100644 index e1ada73..0000000 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - -## 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 PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix deleted file mode 100644 index 049d2ff..0000000 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - -## 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 Tor\PluggableTransports\flashproxy-client --register :0 :9000

1 0

[tor-browser-bundle/master] Specify a tag for fteproxy for all builds.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit d4470583ce2d681589e1f56b73fbbef83c3510be Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 09:39:48 2014 -0800 Specify a tag for fteproxy for all builds. --- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/versions b/gitian/versions index 389e3e1..11eb1db 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f190d5a..b6ee2c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0c7f50d..436536e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Remove a diff file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit ec7da09f018252ff92d3728eb22e27e0934f83d1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 05:25:35 2014 -0800 Remove a diff file. It got added during a conflict resolution that got squashed. --- gitian/versions.diff | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gitian/versions.diff b/gitian/versions.diff deleted file mode 100644 index 69001a8..0000000 --- a/gitian/versions.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/gitian/versions.nightly b/gitian/versions.nightly -index b9b5835..f3dfe9d 100755 ---- a/gitian/versions.nightly -+++ b/gitian/versions.nightly -@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 - ZLIB_TAG=v1.2.8 - LIBEVENT_TAG=release-2.0.21-stable - MINGW_REV=6184 --PYPTLIB_TAG=pyptlib-0.0.4 --OBFSPROXY_TAG=obfsproxy-0.2.3 -+PYPTLIB_TAG=pyptlib-0.0.5 -+OBFSPROXY_TAG=obfsproxy-0.2.4 - FLASHPROXY_TAG=1.6 - - GITIAN_TAG=tor-browser-builder-3.0-4 - - OPENSSL_VER=1.0.1f -+GMP_VER=5.1.3 - FIREFOX_LANG_VER=24.3.0esr - BINUTILS_VER=2.22 - GCC_VER=4.6.3 -@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4 - - ## File names for the source packages - OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz -+GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 - NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz - OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb -@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz - - # Hashes for packages with weak sigs or no sigs - OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -+GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 -@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 - - ## Non-git package URLs - OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} -+GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} - TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… - OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… - BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 9353: Fix ibus issues on some Linux systems.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit c05c7728ef352e598750993190b76485addc26a2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 28 09:55:55 2014 +0000 Bug 9353: Fix ibus issues on some Linux systems. --- RelativeLink/RelativeLink.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 9bab08c..0d25a28 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -189,6 +189,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage"

1 0

[tor-browser-bundle/master] Put the "Tor" subdirectory at the head of PATH for DLL access.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fadb9d2edb3ded8b66e7b2da3182bf78af329339 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Feb 20 19:15:17 2014 +0000 Put the "Tor" subdirectory at the head of PATH for DLL access. Pluggable transport executables are in their own subdirectory, PluggableTransports, but they need to have access to the OpenSSL DLLs. Adding the directory containing the DLLs to PATH makes them visible. I put the directory at the front of PATH and not the end, just in case there is a libeay32.dll or ssleay32.dll somewhere else on the system. https://trac.torproject.org/projects/tor/ticket/10845 --- RelativeLink/RelativeLink.c | 123 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 3 deletions(-) diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c index bae4647..9a6c9f5 100755 --- a/RelativeLink/RelativeLink.c +++ b/RelativeLink/RelativeLink.c @@ -1,4 +1,6 @@ #include <windows.h> +#include <stdio.h> +#include <tchar.h> // // RelativeLink.c @@ -22,8 +24,119 @@ // Put it in the proper place. // -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +// Get the absolute path to a subdirectory of the current directory; i.e. +// "C:\cwd\reldir". Returns a malloc-allocated string or NULL on error. +LPTSTR GetSubdirectory(LPCTSTR reldir) +{ + DWORD bufsize, n; + int len; + LPTSTR cwd, subdir; + + cwd = NULL; + subdir = NULL; + + // The first call to GetCurrentDirectory gets the buffer size; the second + // fills the buffer. + bufsize = GetCurrentDirectory(0, NULL); + if (bufsize == 0) + goto bail; + cwd = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (cwd == NULL) + goto bail; + n = GetCurrentDirectory(bufsize, cwd); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(cwd) + 1 + _tcslen(reldir) + 1; + subdir = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (subdir == NULL) + goto bail; + len = _sntprintf(subdir, bufsize, "%s\\%s", cwd, reldir); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + free(cwd); + return subdir; + +bail: + if (cwd != NULL) + free(cwd); + if (subdir != NULL) + free(subdir); + return NULL; +} + +// Add a directory to the beginning of the PATH environment variable. Returns 0 +// on failure, nonzero on success. +// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682009%28v=vs.85%… +DWORD PrependToPath(LPCTSTR dir) +{ + DWORD bufsize, n, rc, err; + int len; + LPTSTR path, value; + + path = NULL; + value = NULL; + + // First find out how big a buffer we need. + bufsize = GetEnvironmentVariable(TEXT ("PATH"), NULL, 0); + if (bufsize == 0) + { + err = GetLastError(); + if (err == ERROR_ENVVAR_NOT_FOUND) + // If the variable doesn't yet exist, just set it and return. + return SetEnvironmentVariable(TEXT ("PATH"), dir); + else + goto bail; + } + // Now that we know the buffer size, get the value. + path = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (path == NULL) + goto bail; + n = GetEnvironmentVariable(TEXT ("PATH"), path, bufsize); + if (n == 0 || n >= bufsize) + goto bail; + + bufsize = _tcslen(dir) + 1 + _tcslen(path) + 1; + value = (LPTSTR) malloc(bufsize * sizeof(TCHAR)); + if (value == NULL) + goto bail; + len = _sntprintf(value, bufsize, "%s;%s", dir, path); + if (len < 0 || (DWORD) len >= bufsize) + goto bail; + + rc = SetEnvironmentVariable(TEXT ("PATH"), value); + if (rc == 0) + goto bail; + + free(path); + free(value); + return 1; + +bail: + if (path != NULL) + free(path); + if (value != NULL) + free(value); + return 0; +} + +// Returns 0 on failure and nonzero on success. +DWORD StartTorBrowser(void) { + TCHAR *TorDir; + DWORD rc; + // Put the Tor subdirectory at the beginning of PATH so that pluggable + // transports (in their own subdirectory) can access DLLs. + // https://trac.torproject.org/projects/tor/ticket/10845 + TorDir = GetSubdirectory(TEXT ("Tor")); + if (TorDir == NULL) + return 0; + rc = PrependToPath(TorDir); + free(TorDir); + if (rc == 0) + return 0; + STARTUPINFO si; PROCESS_INFORMATION pi; @@ -34,8 +147,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine TCHAR *ProgramToStart; ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\"); - if( !CreateProcess( - NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + return CreateProcess( NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); +} + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) +{ + if (!StartTorBrowser()) { MessageBox ( NULL, TEXT ("Unable to start Tor Browser"), NULL, MB_OK); return -1;

1 0