May 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Allow the urls of git inputs to change without issue.
by mikeperry＠torproject.org 29 May '14

29 May '14

commit a6cb46cdf3332edad9bf84885c51afa4896e7d20 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 13:09:15 2014 -0700 Allow the urls of git inputs to change without issue. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b4ff609..9aff99d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -90,7 +90,7 @@ update_git() { if [ -d "$dir/.git" ]; then - (cd "$dir" && git fetch origin && git fetch --tags origin) + (cd "$dir" && git remote set-url origin $url && git fetch origin && git fetch --tags origin) else if ! git clone "$url"; then echo >&2 "Error: Cloning $url failed"

1 0

[tor-browser-bundle/master] Bug 11641: Fixup versions and input fetching for alpha+nightly.
by mikeperry＠torproject.org 29 May '14

29 May '14

commit 5ae44c2997bef0bf63d79bdf7e56becf93696018 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 12:51:08 2014 -0700 Bug 11641: Fixup versions and input fetching for alpha+nightly. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions.alpha | 33 +++++++++++++++++++++------------ gitian/versions.nightly | 4 ++-- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 2c91c85..b4ff609 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -302,8 +302,8 @@ libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TAG torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG -tor-launcher https://git.torproject.org/user/brade/tor-launcher.git $TORLAUNCHER_TAG -tor-browser https://git.torproject.org/user/brade/tor-browser.git $TORBROWSER_TAG +tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG +tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 702c1e4..ce3520c 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,26 +1,27 @@ -TORBROWSER_VERSION=4.0-alpha-1 +TORBROWSER_VERSION=4.0-alpha1-pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 -VERIFY_TAGS=1 +VERIFY_TAGS=0 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build3 -TOR_TAG=tor-0.2.5.3-alpha -TORLAUNCHER_TAG=0.2.5.4 +TORBROWSER_TAG=tor-browser-24.5.0esr-4.x-1 +TOR_TAG=tor-0.2.4.22 +TORLAUNCHER_TAG=master TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 -NSIS_TAG=v0.1 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 +NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.5 +PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=0.0.2 -FTEPROXY_TAG=0.2.14 +LIBFTE_TAG=ee9e9ddf5c86e6940559a313d2bd22cc33b654c9 # tag 0.0.3 +FTEPROXY_TAG=5e7a9fd498a948d17b0996275ef1b6f743251317 # tag 0.2.15 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 +TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GITIAN_TAG=tor-browser-builder-3.x-5 @@ -39,11 +40,14 @@ M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +PARSLEY_VER=1.2 +HTTPSE_VER=3.5.1 ## 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.20-fn+fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.22-sm+fx+fn.xpi +HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,6 +66,7 @@ M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz +PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -69,7 +74,8 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=dae2abeb3c57240168c1fdfbf6c6664fa64859fb430ca1a05c218f81371f5ad1 +NOSCRIPT_HASH=5ec75d2f6fbf3ff7950a8eea2c7878d887ed3916aa89f99ec76b322b1e140c08 +HTTPSE_HASH=62ac6560bb224a8f5557722153a72fb245b30b345940c537423bfbb7d8144e29 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c @@ -80,6 +86,7 @@ TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 +PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -90,6 +97,7 @@ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} NOSCRIPT_URL=https://addons.cdn.mozilla.net/storage/public-staging/722/${NO… +HTTPSE_URL=https://www.eff.org/files/${HTTPSE_PACKAGE} PYTHON_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_PACKAGE} PYTHON_MSI_URL=http://www.python.org/ftp/python/${PYTHON_VER}/${PYTHON_MSI_… PYCRYPTO_URL=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/${PYCRYPTO_PAC… @@ -102,3 +110,4 @@ M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} +PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 03f4f2f..9958aab 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -6,12 +6,12 @@ VERIFY_TAGS=0 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master HTTPSE_TAG=master -NSIS_TAG=master +NSIS_TAG=00133b8741eb8ca34fc8153d344c7c54a5e3fae9 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184

1 0

[tor-launcher/master] Bug #11641: change TBB directory structure to be more like Firefox's.
by mikeperry＠torproject.org 29 May '14

29 May '14

commit 98fc1549183077ef6076af93fddbce1991271b21 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Apr 29 13:36:53 2014 -0400 Bug #11641: change TBB directory structure to be more like Firefox's. Account for new directory structure in getTorFile(). On Windows, prepend the directory that contains tor.exe to PATH. --- src/components/tl-process.js | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 4316a76..fb795dd 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -367,6 +367,19 @@ TorProcessService.prototype = args.push("1"); } + // On Windows, prepend the Tor program directory to PATH. This is + // needed so that pluggable transports can find OpenSSL DLLs, etc. + // See https://trac.torproject.org/projects/tor/ticket/10845 + if (TorLauncherUtil.isWindows) + { + var env = Cc["@mozilla.org/process/environment;1"] + .getService(Ci.nsIEnvironment); + var path = exeFile.parent.path; + if (env.exists("PATH")) + path += ";" + env.get("PATH"); + env.set("PATH", path); + } + this.mTorProcessStatus = this.kStatusStarting; var p = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess); @@ -646,7 +659,7 @@ TorProcessService.prototype = else { // For Firefox, paths are relative to the top of the TBB install. - var tbbBrowserDepth = 1; // Windows and Linux + var tbbBrowserDepth = 0; // Windows and Linux if (TorLauncherUtil.isAppVersionAtLeast("21.0")) { // In FF21+, CurProcD is the "browser" directory that is next to @@ -654,7 +667,7 @@ TorProcessService.prototype = ++tbbBrowserDepth; } if (TorLauncherUtil.isMac) - tbbBrowserDepth += 4; + tbbBrowserDepth += 2; topDir = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); @@ -667,6 +680,7 @@ TorProcessService.prototype = } } + topDir.append("TorBrowser"); this.mTorFileBaseDir = topDir; }

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'brade/bug11641-rebase1'
by mikeperry＠torproject.org 29 May '14

29 May '14

commit 647c052e70026b116e51dfd16441f2b471e66776 Merge: fc74ecf d1b31fc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 11:57:38 2014 -0700 Merge remote-tracking branch 'brade/bug11641-rebase1' .../PTConfigs/linux/torrc-defaults-appendix | 6 +- .../PTConfigs/windows/torrc-defaults-appendix | 6 +- Bundle-Data/mac/Contents/Info.plist | 44 ------ Bundle-Data/mac/Contents/PkgInfo | 1 - Bundle-Data/mac/Contents/Resources/firefox.icns | Bin 242224 -> 0 bytes .../Data/Browser/profile.default/bookmarks.html | 17 -- .../preferences/extension-overrides.js | 58 ------- Bundle-Data/mac/Data/Browser/profiles.ini | 9 -- Bundle-Data/mac/Data/Tor/torrc-defaults | 10 -- .../Data/Browser/profile.default/bookmarks.html | 17 ++ .../preferences/extension-overrides.js | 58 +++++++ .../mac/TorBrowser/Data/Browser/profiles.ini | 9 ++ Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 10 ++ RelativeLink/Makefile | 26 ---- RelativeLink/RelativeLink-res.rc | 1 - RelativeLink/RelativeLink.c | 162 -------------------- RelativeLink/RelativeLink.ico | Bin 23934 -> 0 bytes RelativeLink/RelativeLink.sh | 8 +- RelativeLink/RelativeLinkOSX.sh | 64 -------- gitian/build-helpers/fix-info-plist.sh | 33 ++++ gitian/descriptors/linux/gitian-bundle.yml | 28 ++-- gitian/descriptors/mac/gitian-bundle.yml | 42 +++-- gitian/descriptors/mac/gitian-firefox.yml | 11 +- .../mac/gitian-pluggable-transports.yml | 25 +-- gitian/descriptors/mac/gitian-tor.yml | 15 +- gitian/descriptors/windows/gitian-bundle.yml | 35 ++--- gitian/fetch-inputs.sh | 6 +- gitian/mkbundle-mac.sh | 6 +- gitian/mkbundle-windows.sh | 6 +- gitian/versions | 10 +- 30 files changed, 226 insertions(+), 497 deletions(-)

1 0

[tor-browser-bundle/master] Bug #11641: change TBB directory structure to be more like Firefox's
by mikeperry＠torproject.org 29 May '14

29 May '14

commit d1b31fc54a1039a7c70fd0538dd60ee44e03fb42 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 28 10:18:50 2014 -0400 Bug #11641: change TBB directory structure to be more like Firefox's Move Tor components into the Firefox directory (under TorBrowser/). Eliminate launcher programs on Mac OS and Windows. --- .../PTConfigs/linux/torrc-defaults-appendix | 6 +- .../PTConfigs/windows/torrc-defaults-appendix | 6 +- Bundle-Data/mac/Contents/Info.plist | 44 ------ Bundle-Data/mac/Contents/PkgInfo | 1 - Bundle-Data/mac/Contents/Resources/firefox.icns | Bin 242224 -> 0 bytes .../Data/Browser/profile.default/bookmarks.html | 17 -- .../preferences/extension-overrides.js | 58 ------- Bundle-Data/mac/Data/Browser/profiles.ini | 9 -- Bundle-Data/mac/Data/Tor/torrc-defaults | 10 -- .../Data/Browser/profile.default/bookmarks.html | 17 ++ .../preferences/extension-overrides.js | 58 +++++++ .../mac/TorBrowser/Data/Browser/profiles.ini | 9 ++ Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 10 ++ RelativeLink/Makefile | 26 ---- RelativeLink/RelativeLink-res.rc | 1 - RelativeLink/RelativeLink.c | 162 -------------------- RelativeLink/RelativeLink.ico | Bin 23934 -> 0 bytes RelativeLink/RelativeLink.sh | 8 +- RelativeLink/RelativeLinkOSX.sh | 64 -------- gitian/build-helpers/fix-info-plist.sh | 33 ++++ gitian/descriptors/linux/gitian-bundle.yml | 28 ++-- gitian/descriptors/mac/gitian-bundle.yml | 42 +++-- gitian/descriptors/mac/gitian-firefox.yml | 11 +- .../mac/gitian-pluggable-transports.yml | 25 +-- gitian/descriptors/mac/gitian-tor.yml | 15 +- gitian/descriptors/windows/gitian-bundle.yml | 35 ++--- gitian/fetch-inputs.sh | 6 +- gitian/mkbundle-mac.sh | 6 +- gitian/mkbundle-windows.sh | 6 +- gitian/versions | 10 +- 30 files changed, 226 insertions(+), 497 deletions(-) diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 8327587..ec45f9c 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -1,11 +1,11 @@ ## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy.bin --managed +ClientTransportPlugin fte exec ./TorBrowser/Tor/PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./Tor/PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./TorBrowser/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 +ClientTransportPlugin flashproxy exec ./TorBrowser/Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index bc1399d..e97d3b7 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -1,12 +1,12 @@ ## fteproxy configuration -ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed +ClientTransportPlugin fte exec TorBrowser\Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3,scramblesuit exec Tor\PluggableTransports\obfsproxy managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec TorBrowser\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 +ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/mac/Contents/Info.plist b/Bundle-Data/mac/Contents/Info.plist deleted file mode 100644 index 52b7781..0000000 --- a/Bundle-Data/mac/Contents/Info.plist +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleDisplayName</key> - <string>TorBrowserBundle</string> - <key>CFBundleExecutable</key> - <string>TorBrowserBundle</string> - <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle TORBROWSER_VERSION Copyright 2014 The Tor Project</string> - <key>CFBundleIconFile</key> - <string>firefox.icns</string> - <key>CFBundleIdentifier</key> - <string>org.torproject.TorBrowserBundle</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>TorBrowserBundle</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>TORBROWSER_VERSION</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>LSEnvironment</key> - <dict/> - <key>LSHasLocalizedDisplayName</key> - <false/> - <key>LSMinimumSystemVersion</key> - <string>10.5</string> - <key>LSUIElement</key> - <false/> - <key>NSAppleScriptEnabled</key> - <false/> - <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle TORBROWSER_VERSION Copyright 2014 The Tor Project</string> - <key>NSMainNibFile</key> - <string>MainMenu</string> - <key>NSPrincipalClass</key> - <string>NSApplication</string> -</dict> -</plist> diff --git a/Bundle-Data/mac/Contents/PkgInfo b/Bundle-Data/mac/Contents/PkgInfo deleted file mode 100644 index c11879e..0000000 --- a/Bundle-Data/mac/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -TORBROWSER diff --git a/Bundle-Data/mac/Contents/Resources/firefox.icns b/Bundle-Data/mac/Contents/Resources/firefox.icns deleted file mode 100644 index 481914f..0000000 Binary files a/Bundle-Data/mac/Contents/Resources/firefox.icns and /dev/null differ diff --git a/Bundle-Data/mac/Data/Browser/profile.default/bookmarks.html b/Bundle-Data/mac/Data/Browser/profile.default/bookmarks.html deleted file mode 100644 index 7aa31dd..0000000 --- a/Bundle-Data/mac/Data/Browser/profile.default/bookmarks.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE NETSCAPE-Bookmark-file-1> - -<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> -<TITLE>Bookmarks</TITLE> -<H1>Bookmarks</H1> - -<DL><p> - <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> -<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar - <DL><p> - <DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX/ //8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A> - <DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX ///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A> - </DL><p> - <HR> -</DL><p> diff --git a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js deleted file mode 100644 index 8ba6211..0000000 --- a/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js +++ /dev/null @@ -1,58 +0,0 @@ -# Overrides for Extension Preferences -# Tor Browser Bundle -# Do not edit this file. - -# Torbutton Preferences: -pref("extensions.torbutton.fresh_install", false); -pref("extensions.torbutton.tor_enabled", true); -pref("extensions.torbutton.proxies_applied", true); -pref("extensions.torbutton.settings_applied", true); -pref("extensions.torbutton.socks_host", "127.0.0.1"); -pref("extensions.torbutton.socks_port", 9150); -pref("extensions.torbutton.tz_string", "UTC+00:00"); - -# HTTPS Everywhere Preferences: -pref("extensions.https_everywhere._observatory.popup_shown", true); -pref("extensions.https_everywhere.toolbar_hint_shown", true); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); -pref("noscript.ABE.enabled", false); -pref("noscript.ABE.notify", false); -pref("noscript.ABE.wanIpAsLocal", false); -pref("noscript.autoReload", false); -pref("noscript.confirmUnblock", false); -pref("noscript.contentBlocker", true); -pref("noscript.default", "about: chrome: resources:"); -pref("noscript.firstRunRedirection", false); -pref("noscript.global", true); -pref("noscript.gtemp", ""); -pref("noscript.opacizeObject", 3); -pref("noscript.forbidWebGL", true); -pref("noscript.forbidFonts", false); -pref("noscript.options.tabSelectedIndexes", "5,0,0"); -pref("noscript.policynames", ""); -pref("noscript.secureCookies", true); -pref("noscript.showAllowPage", false); -pref("noscript.showBaseDomain", false); -pref("noscript.showDistrust", false); -pref("noscript.showRecentlyBlocked", false); -pref("noscript.showTemp", false); -pref("noscript.showTempToPerm", false); -pref("noscript.showUntrusted", false); -pref("noscript.STS.enabled", false); -pref("noscript.subscription.lastCheck", -142148139); -pref("noscript.temp", ""); -pref("noscript.untrusted", ""); -pref("noscript.forbidMedia", false); -// Now handled by plugins.click_to_play -pref("noscript.forbidFlash", false); -pref("noscript.forbidSilverlight", false); -pref("noscript.forbidJava", false); -pref("noscript.forbidPlugins", false); -// Usability tweaks -pref("noscript.showPermanent", false); -pref("noscript.showTempAllowPage", true); -pref("noscript.showRevokeTemp", true); -pref("noscript.notify", false); diff --git a/Bundle-Data/mac/Data/Browser/profiles.ini b/Bundle-Data/mac/Data/Browser/profiles.ini deleted file mode 100644 index 726d784..0000000 --- a/Bundle-Data/mac/Data/Browser/profiles.ini +++ /dev/null @@ -1,9 +0,0 @@ -[General] -StartWithLastProfile=1 - -[Profile0] -Name=default -IsRelative=1 -Path=profile.default -Default=1 - diff --git a/Bundle-Data/mac/Data/Tor/torrc b/Bundle-Data/mac/Data/Tor/torrc deleted file mode 100644 index e69de29..0000000 diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults deleted file mode 100644 index 819b9e8..0000000 --- a/Bundle-Data/mac/Data/Tor/torrc-defaults +++ /dev/null @@ -1,10 +0,0 @@ -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 -# Where to send logging messages. Format is minSeverity[-maxSeverity] -# (stderr|stdout|syslog|file FILENAME). -Log notice stdout -# Bind to this address to listen to connections from SOCKS-speaking -# applications. -SocksPort 9150 -ControlPort 9151 -CookieAuthentication 1 diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html new file mode 100644 index 0000000..7aa31dd --- /dev/null +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/bookmarks.html @@ -0,0 +1,17 @@ +<!DOCTYPE NETSCAPE-Bookmark-file-1> + +<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8"> +<TITLE>Bookmarks</TITLE> +<H1>Bookmarks</H1> + +<DL><p> + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">Bookmarks Toolbar Folder</H3> +<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar + <DL><p> + <DT><A HREF="https://www.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX/ //8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">Learn more about Tor</A> + <DT><A HREF="https://blog.torproject.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8AOwAUDSQAD2QRAA2ZDQAFyw4ABssjAAuQKAAPZAAcAAn///8A////AP///wD///8A////AP///wD///8AIwAMFmtcZP89NDr/TkRJ/ykhJ/8kIij/KAUV/yoAD/9CHy3/EwAMKf///wD///8A////AP///wD///8AHAAACUw4Qf98cnn//Pz8/9TM1/9dPl3/IBYg/y0fKf9bCzT/NQAX/zoeKP8AAAAE////AP///wD///8A////ACgADSYvJSv/2d/h/+Hd4v9sP17/xsHN/1A3Tf8lGSD/YxM9/2sVRP80DB7/Ty44bv///wD///8A////AP///wAwAAUwSERJ/+jx8v/Xx9P/YDVS/7y+zP9BKEH/LiUs/2ceRf91JFT/Ngke/yYACVj///8A////AP///wD///8ANwAJHFNNUv/h6+z/9PD0/31Zev+GeJL/Rj5X/zAjK/9zL1f/ezFd/y0NGv8mAA42////AP///wD///8A////AFUAAAMVAAqge4GF//v8/P/x7/L/hHCN/1NVbf87KDP/g0Fq/14pSP9PLz3/AAAABP///wD///8A////AP///wD///8AOQAcCQcACpWcoqX/+/39/7PJ0v9oeYn/Ry89/5BVff8+IC//IAANKP///wD///8A////AP///wD///8A////AP///wBGABcLCgAHmXFucv/G4eb/SUhS/109UP9WOkf/WEJIhf///wD///8A////AP///wD///8A////AP///wD///8A////AFUAKgYZAAiGRkNJ/0IyO/9XQkj/KQAIHzMAAAX ///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AMwANFFxMU/9WQEr/PgAMKf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AD4AFyFWUln/OW5Y/wCobmQAqnEJ////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCZAGYFQpF3hQteOv8AiVGpGb2BbP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAD//wMAjF2oB35N8gClYpcAuHEk////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AANOEHQCvdn8ArGipALJshwC4ezb///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wAA/78IANmXNgDFgyMAv4AM////AP///wD///8A//8AAPAPAADgBwAA4AcAAOAHAADgBwAA8AcAAPgPAAD8HwAA/j8AAP5/AAD+fwAA/38AAP//AAD//wAA//8AAA==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$0gnTO1">The Tor Blog</A> + </DL><p> + <HR> +</DL><p> diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js new file mode 100644 index 0000000..8ba6211 --- /dev/null +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js @@ -0,0 +1,58 @@ +# Overrides for Extension Preferences +# Tor Browser Bundle +# Do not edit this file. + +# Torbutton Preferences: +pref("extensions.torbutton.fresh_install", false); +pref("extensions.torbutton.tor_enabled", true); +pref("extensions.torbutton.proxies_applied", true); +pref("extensions.torbutton.settings_applied", true); +pref("extensions.torbutton.socks_host", "127.0.0.1"); +pref("extensions.torbutton.socks_port", 9150); +pref("extensions.torbutton.tz_string", "UTC+00:00"); + +# HTTPS Everywhere Preferences: +pref("extensions.https_everywhere._observatory.popup_shown", true); +pref("extensions.https_everywhere.toolbar_hint_shown", true); + +# NoScript Preferences: +pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +pref("capability.policy.maonoscript.sites", "about: chrome: resource:"); +pref("noscript.ABE.enabled", false); +pref("noscript.ABE.notify", false); +pref("noscript.ABE.wanIpAsLocal", false); +pref("noscript.autoReload", false); +pref("noscript.confirmUnblock", false); +pref("noscript.contentBlocker", true); +pref("noscript.default", "about: chrome: resources:"); +pref("noscript.firstRunRedirection", false); +pref("noscript.global", true); +pref("noscript.gtemp", ""); +pref("noscript.opacizeObject", 3); +pref("noscript.forbidWebGL", true); +pref("noscript.forbidFonts", false); +pref("noscript.options.tabSelectedIndexes", "5,0,0"); +pref("noscript.policynames", ""); +pref("noscript.secureCookies", true); +pref("noscript.showAllowPage", false); +pref("noscript.showBaseDomain", false); +pref("noscript.showDistrust", false); +pref("noscript.showRecentlyBlocked", false); +pref("noscript.showTemp", false); +pref("noscript.showTempToPerm", false); +pref("noscript.showUntrusted", false); +pref("noscript.STS.enabled", false); +pref("noscript.subscription.lastCheck", -142148139); +pref("noscript.temp", ""); +pref("noscript.untrusted", ""); +pref("noscript.forbidMedia", false); +// Now handled by plugins.click_to_play +pref("noscript.forbidFlash", false); +pref("noscript.forbidSilverlight", false); +pref("noscript.forbidJava", false); +pref("noscript.forbidPlugins", false); +// Usability tweaks +pref("noscript.showPermanent", false); +pref("noscript.showTempAllowPage", true); +pref("noscript.showRevokeTemp", true); +pref("noscript.notify", false); diff --git a/Bundle-Data/mac/TorBrowser/Data/Browser/profiles.ini b/Bundle-Data/mac/TorBrowser/Data/Browser/profiles.ini new file mode 100644 index 0000000..726d784 --- /dev/null +++ b/Bundle-Data/mac/TorBrowser/Data/Browser/profiles.ini @@ -0,0 +1,9 @@ +[General] +StartWithLastProfile=1 + +[Profile0] +Name=default +IsRelative=1 +Path=profile.default +Default=1 + diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc new file mode 100644 index 0000000..e69de29 diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults new file mode 100644 index 0000000..819b9e8 --- /dev/null +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -0,0 +1,10 @@ +# If non-zero, try to write to disk less frequently than we would otherwise. +AvoidDiskWrites 1 +# Where to send logging messages. Format is minSeverity[-maxSeverity] +# (stderr|stdout|syslog|file FILENAME). +Log notice stdout +# Bind to this address to listen to connections from SOCKS-speaking +# applications. +SocksPort 9150 +ControlPort 9151 +CookieAuthentication 1 diff --git a/RelativeLink/Makefile b/RelativeLink/Makefile deleted file mode 100644 index 4caa54b..0000000 --- a/RelativeLink/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -### -### A simple Makefile to automate building the RelativeLink program -### Copyright 2008 Jacob Appelbaum <jacob(a)appelbaum.net> -### See LICENSE for licensing information -### - -APPNAME = StartTorBrowserBundle.exe -OBJECTS = RelativeLink-res.rc.o RelativeLink.o -CFLAGS = -Wall -mwindows -static -frandom-seed=tor -CC = i686-w64-mingw32-gcc - -all: RelativeLink - -RelativeLink: $(OBJECTS) - $(CC) $(OBJECTS) $(CFLAGS) -o $(APPNAME) - strip $(APPNAME) - -RelativeLink.o: RelativeLink.c - $(CC) $(CFLAGS) -c RelativeLink.c -o RelativeLink.o - -RelativeLink-res.rc.o: RelativeLink-res.rc - i686-w64-mingw32-windres RelativeLink-res.rc RelativeLink-res.rc.o - -clean: - rm -rf *.exe - rm -rf *.o diff --git a/RelativeLink/RelativeLink-res.rc b/RelativeLink/RelativeLink-res.rc deleted file mode 100755 index ef949c7..0000000 --- a/RelativeLink/RelativeLink-res.rc +++ /dev/null @@ -1 +0,0 @@ -1 ICON "RelativeLink.ico" diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c deleted file mode 100755 index 9a6c9f5..0000000 --- a/RelativeLink/RelativeLink.c +++ /dev/null @@ -1,162 +0,0 @@ -#include <windows.h> -#include <stdio.h> -#include <tchar.h> - -// -// RelativeLink.c -// by Jacob Appelbaum <jacob(a)appelbaum.net> -// -// Copyright 2008 Jacob Appelbaum <jacob(a)appelbaum.net> -// See LICENSE for licensing information -// -// This is a very small program to work around the lack of relative links -// in any of the most recent builds of Windows. -// -// To build this, you need Cygwin or MSYS. -// -// You need to build the icon resource first: -// windres RelativeLink-res.rc RelativeLink-res.o -// -// Then you'll compile the program and include the icon object file: -// gcc -Wall -mwindows -o StartTorBrowserBundle RelativeLink.c RelativeLink-res.o -// -// End users will be able to use StartTorBrowserBundle.exe -// Put it in the proper place. -// - -// 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; - - ZeroMemory ( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory ( &pi, sizeof(pi) ); - - TCHAR *ProgramToStart; - ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\"); - - 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; - } - - return 0; -} diff --git a/RelativeLink/RelativeLink.ico b/RelativeLink/RelativeLink.ico deleted file mode 100755 index cce2759..0000000 Binary files a/RelativeLink/RelativeLink.ico and /dev/null differ diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 0d25a28..d4bd59c 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -5,7 +5,7 @@ # # To run in debug mode simply pass --debug # -# Copyright 2011 The Tor Project. See LICENSE for licensing information. +# Copyright 2014 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser Bundle" @@ -208,14 +208,14 @@ else fi SYSARCHITECTURE=$(getconf LONG_BIT) -TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF $[[:digit:]]*$') +TORARCHITECTURE=$(expr "$(file TorBrowser/Tor/tor)" : '.*ELF $[[:digit:]]*$') if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then complain "Wrong architecture? 32-bit vs. 64-bit." exit 1 fi -LD_LIBRARY_PATH="${HOME}/Tor/" +LD_LIBRARY_PATH="${HOME}/TorBrowser/Tor/" export LD_LIBRARY_PATH # XXX: Debug mode for Firefox?? @@ -227,7 +227,7 @@ cd "${HOME}" # (probably filenames or URLs) to Firefox. # !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. # !!! Use at your own risk! -./Browser/firefox -no-remote -profile Data/Browser/profile.default ${@} +./firefox -profile TorBrowser/Data/Browser/profile.default ${@} exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode" diff --git a/RelativeLink/RelativeLinkOSX.sh b/RelativeLink/RelativeLinkOSX.sh deleted file mode 100755 index f30980b..0000000 --- a/RelativeLink/RelativeLinkOSX.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# Mac OS does not really require something like RelativeLink.c -# However, we do want to have the same look and feel with similar features. -# In the future, we may want this to be a C binary with a custom icon but at the moment -# it's quite simple to just use a shell script -# -# To run in debug mode, simply pass -debug or --debug on the command line. -# -# WARNING: In debug mode, this script may cause dyld to write to the system -# log file. -# -# Copyright 2010 The Tor Project. See LICENSE for licensing information. - -DEBUG_TBB=0 - -if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then - DEBUG_TBB=1 - printf "\nDebug enabled.\n\n" -fi - -# If the user hasn't requested 'debug mode', close whichever of stdout -# and stderr are not ttys, to keep Firefox and the stuff loaded by/for -# it (including the system's shared-library loader) from printing -# messages to be logged in /var/log/system.log . (Users wouldn't have -# seen messages there anyway.) -# -# If the user has requested 'debug mode', don't muck with the FDs. -if [ "$DEBUG_TBB" -ne 1 ]; then - if [ '!' -t 1 ]; then - # stdout is not a tty - exec >/dev/null - fi - if [ '!' -t 2 ]; then - # stderr is not a tty - exec 2>/dev/null - fi -fi - -HOME="${0%%Contents/MacOS/TorBrowserBundle}" -export HOME - -DYLD_LIBRARY_PATH=${HOME}/Contents/Frameworks -export LDPATH -export DYLD_LIBRARY_PATH - -if [ "$DEBUG_TBB" -eq 1 ]; then - DYLD_PRINT_LIBRARIES=1 - export DYLD_PRINT_LIBRARIES -fi - -if [ "$DEBUG_TBB" -eq 1 ]; then - printf "\nStarting Tor Browser now\n" - cd "${HOME}" - printf "\nLaunching Tor Browser from: `pwd`\n" - ./Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox -jsconsole -no-remote -profile "${HOME}/Data/Browser/profile.default" - printf "\nTor Browser exited with the following return code: $?\n" - exit -fi - -# not in debug mode, run proceed normally -printf "\nLaunching Tor Browser Bundle for OS X in ${HOME}\n" -cd "${HOME}" -open "${HOME}/Contents/MacOS/TorBrowser.app" --args -no-remote -profile "${HOME}/Data/Browser/profile.default" diff --git a/gitian/build-helpers/fix-info-plist.sh b/gitian/build-helpers/fix-info-plist.sh new file mode 100755 index 0000000..77c6af7 --- /dev/null +++ b/gitian/build-helpers/fix-info-plist.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# We cannot use set -e in this script because read returns a non-zero value. +export LC_ALL=C + +usage() +{ + echo "usage: $0 TORBROWSER_VERSION < Info.plist > FixedInfo.plist" 1>&2 + exit 2 +} + +if [ $# -ne 1 ]; then + usage; +fi + +TORBROWSER_VERSION="$1"; shift + +# Replace version numbers. +# Add NSHumanReadableCopyright + +YEAR=2014 +COPYRIGHT="Tor Browser $TORBROWSER_VERSION Copyright $YEAR The Tor Project" +read -r -d "" SED_SCRIPT <<END +\#<key>CFBundleGetInfoString</key>#,\#</string>\$#{ + \#</string>\$#s#>.*<#>TorBrowser $TORBROWSER_VERSION<# +} +\#<key>CFBundleShortVersionString</key>#,\#</string>\$#{ + \#</string>\$#s#>.*<#>$TORBROWSER_VERSION<# + \#</string>\$#a\ <key>NSHumanReadableCopyright</key>\n <string>$COPYRIGHT</string> + +} +END + +sed -e "$SED_SCRIPT" diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 006883c..8543a33 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -61,9 +61,9 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org - mkdir -p tor-browser/Data/Browser/Caches - mkdir -p tor-browser/Docs/sources/ + mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tor-browser/Browser/TorBrowser/Data/Browser/Caches + mkdir -p tor-browser/Browser/TorBrowser/Docs/sources/ # Preparing Python for HTTPS-Everywhere. unzip -d $INSTDIR python-linux$GBUILD_BITS-utils.zip export PATH=$INSTDIR/python/bin:$PATH @@ -76,7 +76,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . + ~/build/dzip.sh ../../../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton @@ -86,7 +86,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . + ~/build/dzip.sh ../../../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # #cd https-everywhere @@ -94,11 +94,11 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 #rm -f .git/refs/heads/master #./makexpi.sh - #cp pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cp pkg/*.xpi ../tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi #cd .. # - cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ - cd tor-browser/Data/Browser/profile.default/extensions + cp *.xpi tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions/ + cd tor-browser/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi @@ -106,10 +106,12 @@ script: | cd ~/build/ # unzip relativelink-src.zip - cp RelativeLink/RelativeLink.sh tor-browser/start-tor-browser + cp RelativeLink/RelativeLink.sh tor-browser/Browser/start-tor-browser # cd tor-browser + ln -s Browser/start-tor-browser unzip ~/build/tor-browser-linux$GBUILD_BITS-gbuilt.zip + cd Browser/TorBrowser unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip @@ -120,11 +122,11 @@ script: | fi chmod 700 Data/Browser chmod 700 Data/Tor - cd .. + cd ../../.. # # Copy reproducibility info - cp versions tor-browser/Docs/sources/ - cp bundle.inputs tor-browser/Docs/sources/ + cp versions tor-browser/Browser/TorBrowser/Docs/sources/ + cp bundle.inputs tor-browser/Browser/TorBrowser/Docs/sources/ # cp -a tor-browser tor-browser_en-US # @@ -149,7 +151,7 @@ script: | do xpi=$LANG.xpi cp -a ../tor-browser ../tor-browser_$LANG - cp $xpi ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $xpi ../tor-browser_$LANG/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. pushd tor-browser_$LANG/Browser/browser/ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 2668c7d..d959d82 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -35,7 +35,6 @@ files: - "pluggable-transports-mac32-gbuilt.zip" - "torrc-defaults-appendix-mac" - "bridge_prefs.js" -- "relativelink-src.zip" - "mac-skeleton.zip" - "dmg-applications.tar.xz" - "dmg-desktop.tar.xz" @@ -70,10 +69,10 @@ script: | fi # mkdir -p $OUTDIR/ - mkdir -p $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org - mkdir -p $TORBROWSER_NAME.app/Data/Browser/Caches - mkdir -p $TORBROWSER_NAME.app/Docs/sources - mkdir -p $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches + mkdir -p $TORBROWSER_NAME.app/TorBrowser/Docs/sources + mkdir -p $TORBROWSER_NAME.app/Contents/MacOS mkdir -p dmg # cd tor-launcher @@ -83,7 +82,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . + ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton @@ -93,7 +92,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . + ~/build/dzip.sh ../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # # cd https-everywhere @@ -101,27 +100,24 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 # rm -f .git/refs/heads/master # ./makexpi.sh - # cp pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + # cp pkg/*.xpi ../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi # cd .. # - cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ - cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/ + cp *.xpi ./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ + cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/ mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # - unzip relativelink-src.zip - cp RelativeLink/RelativeLinkOSX.sh $TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle - # unzip tor-mac$GBUILD_BITS-gbuilt.zip if [ $BUILD_PT_BUNDLES ]; then unzip pluggable-transports-mac$GBUILD_BITS-gbuilt.zip fi cd $TORBROWSER_NAME.app unzip ~/build/mac-skeleton.zip - sed -i -e "s/TORBROWSER_VERSION/$TORBROWSER_VERSION/" Contents/Info.plist + cd TorBrowser unzip ~/build/tbb-docs.zip if [ $BUILD_PT_BUNDLES ]; then cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults @@ -130,13 +126,13 @@ script: | # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real cp ~/build/mac-tor.sh Tor/tor - cd Contents/MacOS/ + cd .. unzip ~/build/tor-browser-mac$GBUILD_BITS-gbuilt.zip - cd ../../../ + cd .. # # Copy reproducibility info - cp versions $TORBROWSER_NAME.app/Docs/sources/ - cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/ + cp versions $TORBROWSER_NAME.app/TorBrowser/Docs/sources/ + cp bundle.inputs $TORBROWSER_NAME.app/TorBrowser/Docs/sources/ # # Set up DMG skeleton cd libdmg-hfsplus @@ -149,7 +145,7 @@ script: | tar -Jxvf ~/build/dmg-applications.tar.xz cd .. # - pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + pushd $TORBROWSER_NAME.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js # Set the version of the bundle. grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed @@ -168,8 +164,8 @@ script: | else # XXX: We need to insert these placeholders because otherwise mkisofs won't # include these otherwise empty dirs: - touch ~/build/$TORBROWSER_NAME.app/Data/Browser/Caches/placeholder.txt - touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt + touch ~/build/$TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches/placeholder.txt + touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg rm -rf ~/build/dmg/$TORBROWSER_APP.app @@ -187,10 +183,10 @@ script: | DEST=$TORBROWSER_APP fi cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app - cp $xpi ~/build/dmg/$DEST.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $xpi ~/build/dmg/$DEST.app/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - pushd ~/build/dmg/$DEST.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ + pushd ~/build/dmg/$DEST.app/Contents/MacOS/browser/ mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/ # Set the locale of the bundle. diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index 1832f55..2616216 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -21,6 +21,7 @@ files: - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" - "dzip.sh" +- "fix-info-plist.sh" - "versions" script: | INSTDIR="$HOME/install/" @@ -64,15 +65,21 @@ script: | make -C obj-macos package INNER_MAKE_PACKAGE=true cp -a obj-macos/dist/firefox/* $INSTDIR # Remove firefox-bin (we don't use it, see ticket #10126) - rm -f $INSTDIR/Browser/firefox-bin + rm -f $INSTDIR/TorBrowser.app/Contents/MacOS/firefox-bin # cd $INSTDIR # XXX: Find a better way to tell that we are having a 32bit build GBUILD_BITS=32 + # Adjust the Info.plist file + INFO_PLIST=TorBrowser.app/Contents/Info.plist + mv $INFO_PLIST tmp.plist + ~/build/fix-info-plist.sh $TORBROWSER_VERSION < tmp.plist > $INFO_PLIST + rm -f tmp.plist ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja if [ -f TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then # FF24 includes a third .ja ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/browser/omni.ja fi - ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./TorBrowser.app + cd TorBrowser.app/ + ~/build/dzip.sh tor-browser-mac${GBUILD_BITS}-gbuilt.zip ./Contents cp tor-browser-mac${GBUILD_BITS}-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 59109a7..c206d06 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -43,7 +43,9 @@ files: - "openssl-mac32-utils.zip" script: | INSTDIR="$HOME/install" - PTDIR="$INSTDIR/TorBrowserBundle.app/Tor/PluggableTransports" + TBDIR="$INSTDIR/TorBrowserBundle.app/TorBrowser" + PTDIR="$TBDIR/Tor/PluggableTransports" + export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC @@ -58,7 +60,8 @@ script: | export PATH="$PATH:$HOME/build/apple-osx/bin/" unzip -d $INSTDIR gmp-mac32-utils.zip unzip -d $INSTDIR openssl-mac32-utils.zip - cp $INSTDIR/gmp/lib/*dylib* $INSTDIR/TorBrowserBundle.app/Tor/ + cp $INSTDIR/gmp/lib/*dylib* $TBDIR/Tor/ + # export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar export CC=$HOME/build/apple-osx/bin/i686-apple-darwin11-gcc @@ -149,8 +152,8 @@ script: | python setup.py build --build-lib build cp -a build/obfsproxy $PTDIR/ cp -a bin/obfsproxy $PTDIR/obfsproxy.bin - mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy - cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy + mkdir -p $TBDIR/Docs/Obfsproxy + cp -a {LICENSE,README} $TBDIR/Docs/Obfsproxy # XXX: Workaround for bug 11190 sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. @@ -175,8 +178,8 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client cp -a dist/flashproxy-client/{flashproxy,flashproxy-client,flashproxy-reg-appspot,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} $PTDIR/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy - cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy + mkdir -p $TBDIR/Docs/FlashProxy + cp -a {doc/*,README,LICENSE,ChangeLog} $TBDIR/Docs/FlashProxy cd .. # Building libfte @@ -184,9 +187,9 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" CFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CFLAGS" CXXFLAGS="-L$INSTDIR/Tor -I$INSTDIR/gmp/include $CXXFLAGS" make cp -ra fte $PTDIR/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/libfte - cp -a {LICENSE,README.md} $INSTDIR/TorBrowserBundle.app/Docs/libfte - cp -an thirdparty/re2/LICENSE $INSTDIR/TorBrowserBundle.app/Docs/libfte/LICENSE.re2 + mkdir -p $TBDIR/Docs/libfte + cp -a {LICENSE,README.md} $TBDIR/Docs/libfte + cp -an thirdparty/re2/LICENSE $TBDIR/Docs/libfte/LICENSE.re2 cd .. # Building fteproxy @@ -194,8 +197,8 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin cp -ra fteproxy $PTDIR/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/fteproxy - cp -a {COPYING,README.md} $INSTDIR/TorBrowserBundle.app/Docs/fteproxy + mkdir -p $TBDIR/Docs/fteproxy + cp -a {COPYING,README.md} $TBDIR/Docs/fteproxy cd .. # Grabbing the result diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 054e1a8..778149b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -34,6 +34,7 @@ files: - "libevent-mac32-utils.zip" script: | INSTDIR="$HOME/install" + TBDIR="$INSTDIR/TorBrowserBundle.app/TorBrowser" source versions export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME @@ -42,8 +43,8 @@ script: | umask 0022 # mkdir -p $INSTDIR/bin/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Tor/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Data/Tor/ + mkdir -p $TBDIR/Tor/ + mkdir -p $TBDIR/Data/Tor/ mkdir -p $OUTDIR/ # sudo dpkg -i *.deb @@ -51,7 +52,7 @@ script: | export PATH="$PATH:$HOME/build/apple-osx/bin/" unzip -d $INSTDIR openssl-mac32-utils.zip unzip -d $INSTDIR libevent-mac32-utils.zip - cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ + cp $INSTDIR/libevent/lib/libevent-*.dylib $TBDIR/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` # Building tor @@ -88,10 +89,10 @@ script: | make $MAKEOPTS make install cd $INSTDIR - cp bin/tor TorBrowserBundle.app/Tor/ - cp share/tor/geoip TorBrowserBundle.app/Data/Tor/ - cp share/tor/geoip6 TorBrowserBundle.app/Data/Tor/ - cd TorBrowserBundle.app/Tor/ + cp bin/tor $TBDIR/Tor/ + cp share/tor/geoip $TBDIR/Data/Tor/ + cp share/tor/geoip6 $TBDIR/Data/Tor/ + cd $TBDIR/Tor/ i686-apple-darwin11-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor # Grabbing the result diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index ebde49b..8f21b3b 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -33,7 +33,6 @@ files: - "pluggable-transports-win32-gbuilt.zip" - "torrc-defaults-appendix-windows" - "bridge_prefs.js" -- "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" - "noscript(a)noscript.net.xpi" @@ -56,9 +55,9 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org - mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/Caches - mkdir -p tbb-windows-installer/"Tor Browser"/Docs/sources + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/Caches + mkdir -p tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Docs/sources # cd tor-launcher make clean @@ -67,7 +66,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . + ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton @@ -76,7 +75,7 @@ script: | # FIXME: Switch to re-dzip.sh here? cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . + ~/build/dzip.sh ../../../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # #cd https-everywhere @@ -84,26 +83,20 @@ script: | # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066 #rm -f .git/refs/heads/master #./makexpi.sh - #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi + #cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi #cd .. # - cp *.xpi tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions - cd tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions + cp *.xpi tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions + cd tbb-windows-installer/"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi cd https-everywhere(a)eff.org unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ # - unzip relativelink-src.zip - cd RelativeLink - make clean - make - cp StartTorBrowserBundle.exe ../tbb-windows-installer/"Tor Browser"/"Start Tor Browser.exe" - cd .. - # cd tbb-windows-installer/"Tor Browser" unzip ~/build/tor-browser-win32-gbuilt.zip + cd Browser/TorBrowser unzip ~/build/tor-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip @@ -112,11 +105,11 @@ script: | 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 .. + cd ../../.. # # Copy reproducibility info - cp ../versions "Tor Browser"/Docs/sources/ - cp ../bundle.inputs "Tor Browser"/Docs/sources/ + cp ../versions "Tor Browser"/Browser/TorBrowser/Docs/sources/ + cp ../bundle.inputs "Tor Browser"/Browser/TorBrowser/Docs/sources/ # pushd "Tor Browser"/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js @@ -137,7 +130,7 @@ script: | for LANG in $BUNDLE_LOCALES do xpi=$LANG.xpi - cp $xpi ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $xpi ../"Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. pushd "Tor Browser"/Browser/browser/ @@ -149,6 +142,6 @@ script: | makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe - rm "Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + rm "Tor Browser"/Browser/TorBrowser/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd win32-langpacks done diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 0eceaf7..2c91c85 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -296,14 +296,14 @@ cd inputs while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF -tbb-windows-installer https://github.com/moba/tbb-windows-installer.git $NSIS_TAG +tbb-windows-installer https://github.com/MarkCSmith/tbb-windows-installer.git $NSIS_TAG zlib https://github.com/madler/zlib.git $ZLIB_TAG libevent https://github.com/libevent/libevent.git $LIBEVENT_TAG tor https://git.torproject.org/tor.git $TOR_TAG https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TAG torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG -tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG -tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG +tor-launcher https://git.torproject.org/user/brade/tor-launcher.git $TORLAUNCHER_TAG +tor-browser https://git.torproject.org/user/brade/tor-browser.git $TORBROWSER_TAG pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index e852989..00073e9 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -49,11 +49,7 @@ cp -a $WRAPPER_DIR/$VERSIONS_FILE $GITIAN_DIR/inputs/versions cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ -cd $WRAPPER_DIR/.. -rm -f $GITIAN_DIR/inputs/relativelink-src.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ - -cd ./Bundle-Data/ +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/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index ecabeae..019ddec 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -50,11 +50,7 @@ cp -r $WRAPPER_DIR/build-helpers/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/patches/* $GITIAN_DIR/inputs/ cp $WRAPPER_DIR/gpg/ubuntu-wine.gpg $GITIAN_DIR/inputs/ -cd $WRAPPER_DIR/.. -rm -f $GITIAN_DIR/inputs/relativelink-src.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./RelativeLink/ - -cd ./Bundle-Data/ +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 diff --git a/gitian/versions b/gitian/versions index 6424316..d37a117 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,17 +1,17 @@ -TORBROWSER_VERSION=3.6.2pre +TORBROWSER_VERSION=3.7pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 -VERIFY_TAGS=1 +VERIFY_TAGS=0 FIREFOX_VERSION=24.5.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 +TORBROWSER_TAG=bug11641 TOR_TAG=tor-0.2.4.22 -TORLAUNCHER_TAG=0.2.5.4 +TORLAUNCHER_TAG=bug11641 TORBUTTON_TAG=1.6.9.0 HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 -NSIS_TAG=v0.1 +NSIS_TAG=bug11641 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184

1 0

[tor-browser-bundle/master] Revert "Remove scamblesuit bridges for now."
by mikeperry＠torproject.org 29 May '14

29 May '14

commit fc74ecfeeb9c94c502a1fb7f17f672bc3fd7d4e3 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 11:48:11 2014 -0700 Revert "Remove scamblesuit bridges for now." This reverts commit 429309ce162a0e1c36c9d3ed9c5bd89ca4879fd8. The alphas will have scramblesuit. --- Bundle-Data/PTConfigs/bridge_prefs.js | 6 +++--- Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 2 +- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index 6d8ac38..8d2afed 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -22,6 +22,6 @@ pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A1 pref("extensions.torlauncher.default_bridge.fte.4", "fte 131.252.210.150:8080 0E858AC201BF0F3FA3C462F64844CBFFC7297A42"); pref("extensions.torlauncher.default_bridge.fte.5", "fte 79.125.3.12:8080 272465348803EE2546A9BB8EE37D462915531F09"); -//pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); -//pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); -//pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); +pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit 188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI"); +pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit 188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T"); +pref("extensions.torlauncher.default_bridge.scramblesuit.3", "scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH"); diff --git a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix index 87108bd..8327587 100644 --- a/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec ./Tor/PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # # Change the second number here (9000) to the number of a port that can diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 7c6e6a5..19fc8e0 100644 --- a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec PluggableTransports/fteproxy.bin --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec PluggableTransports/obfsproxy.bin managed ## flash proxy configuration # diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index 049d2ff..bc1399d 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -2,7 +2,7 @@ ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed +ClientTransportPlugin obfs2,obfs3,scramblesuit exec Tor\PluggableTransports\obfsproxy managed ## flash proxy configuration #

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 29 May '14

29 May '14

commit 0e5c986b5026d60c2fb6e7a77e6b3759b23ba00f Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 29 19:45:15 2014 +0000 Update translations for https_everywhere --- sl/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sl/ssl-observatory.dtd b/sl/ssl-observatory.dtd index 50cac60..b64e2f7 100644 --- a/sl/ssl-observatory.dtd +++ b/sl/ssl-observatory.dtd @@ -90,7 +90,7 @@ Pridržite miško nad možnosti za več podrobnosti:"> <!ENTITY ssl-observatory.warning.showcert "Pokaži certifikatno verigo"> <!ENTITY ssl-observatory.warning.okay "Razumem"> <!ENTITY ssl-observatory.warning.text "EFF SSL Observatorij je izdal opozorilo za HTTPS certifikat(e) za to stran:"> -<!ENTITY ssl-observatory.warning.defense "If you are logged in to this site, it may be advisable to change your password once you have a safe connection. (These warnings can be disabled in the "SSL Observatory" tab of the HTTPS Everywhere preferences dialog.)"> +<!ENTITY ssl-observatory.warning.defense "Če ste vpisani na tej strani je priporočljivo da spremenite geslo, ko boste varno povezani. (Ta opozorila lahko onemogočite v nastavitvah HTTPS Everywhere, v zavihku "SSL Observatorij".)"> <!ENTITY ssl-observatory.prefs.self_signed "Predložite in preverite samopodpisana potrdila">

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 May '14

29 May '14

commit a752795a0e265c2432d7e9757b3681b925e26213 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 29 19:15:03 2014 +0000 Update translations for bridgedb --- ar/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po index 57582e4..ee18925 100644 --- a/ar/LC_MESSAGES/bridgedb.po +++ b/ar/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-29 18:02+0000\n" +"PO-Revision-Date: 2014-05-29 19:01+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 29 May '14

29 May '14

commit 216c8cd7b5c8b6856c33b1254211b44a7b61c7b7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 29 18:45:06 2014 +0000 Update translations for bridgedb_completed --- pt_BR/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 4f367fd..a716b70 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-29 18:14+0000\n" +"PO-Revision-Date: 2014-05-29 18:31+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "TIPOS de transportes atualmente compatíveis:" #: lib/bridgedb/strings.py:30 #, python-format msgid "Hey, %s!" -msgstr "Oi, %s!" +msgstr "Olá, %s!" #: lib/bridgedb/strings.py:31 msgid "Hello, friend!" @@ -195,7 +195,7 @@ msgstr "Como começar a usar as suas pontes" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "Para inserir pontes no navegador Tor, siga as instruçoes no %s página\n de downloads do navegador Tor %s para iniciá-lo." +msgstr "Para inserir pontes no navegador Tor, siga as instruções no %s página\n de downloads do navegador Tor %s para iniciar o navegador Tor." #: lib/bridgedb/strings.py:108 msgid "" @@ -215,7 +215,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saída. Por fim, clique em 'Conectar'.\nDeve ser o suficiente! Se encontrar problemas, tente clicar no botão\n'Ajuda' no assistente de 'Configurações da Rede Tor' mais uma maior assistência." +msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saída. Por fim, clique em 'Conectar'.\nIsso deve ser o suficiente! Se você encontrar problemas, tente clicar no botão\n'Ajuda' no assistente de 'Configurações da Rede Tor', para mais assistência." #: lib/bridgedb/strings.py:122 msgid "Displays this message." @@ -240,7 +240,7 @@ msgstr "Obter uma cópia da chave pública GnuPG do BridgeDB." #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "Reportar um Erro" +msgstr "Relatar um Erro" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" @@ -256,7 +256,7 @@ msgstr "Contato" #: lib/bridgedb/templates/bridges.html:65 msgid "Uh oh, spaghettios!" -msgstr "Oh oh, Espaguettinhos" +msgstr "Ops, um erro!" #: lib/bridgedb/templates/bridges.html:70 msgid "There currently aren't any bridges available..." @@ -297,7 +297,7 @@ msgstr "Passo %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Agora, %s adicionar as pontes ao Navegador Tor %s" +msgstr "Agora, %s inserir as pontes no Navegador Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 29 May '14

29 May '14

commit 1f06f0d328f6e8ab6ec71712a30723a8f533ca10 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 29 18:45:03 2014 +0000 Update translations for bridgedb --- pt_BR/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po index 4f367fd..a716b70 100644 --- a/pt_BR/LC_MESSAGES/bridgedb.po +++ b/pt_BR/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-05-16 18:39+0000\n" -"PO-Revision-Date: 2014-05-29 18:14+0000\n" +"PO-Revision-Date: 2014-05-29 18:31+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgstr "TIPOS de transportes atualmente compatíveis:" #: lib/bridgedb/strings.py:30 #, python-format msgid "Hey, %s!" -msgstr "Oi, %s!" +msgstr "Olá, %s!" #: lib/bridgedb/strings.py:31 msgid "Hello, friend!" @@ -195,7 +195,7 @@ msgstr "Como começar a usar as suas pontes" msgid "" "To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" "Browser download page %s to start Tor Browser." -msgstr "Para inserir pontes no navegador Tor, siga as instruçoes no %s página\n de downloads do navegador Tor %s para iniciá-lo." +msgstr "Para inserir pontes no navegador Tor, siga as instruções no %s página\n de downloads do navegador Tor %s para iniciar o navegador Tor." #: lib/bridgedb/strings.py:108 msgid "" @@ -215,7 +215,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saída. Por fim, clique em 'Conectar'.\nDeve ser o suficiente! Se encontrar problemas, tente clicar no botão\n'Ajuda' no assistente de 'Configurações da Rede Tor' mais uma maior assistência." +msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar suas novas pontes, copie e\ncole as coordenadas das pontes na caixa de texto de saída. Por fim, clique em 'Conectar'.\nIsso deve ser o suficiente! Se você encontrar problemas, tente clicar no botão\n'Ajuda' no assistente de 'Configurações da Rede Tor', para mais assistência." #: lib/bridgedb/strings.py:122 msgid "Displays this message." @@ -240,7 +240,7 @@ msgstr "Obter uma cópia da chave pública GnuPG do BridgeDB." #: lib/bridgedb/templates/base.html:91 msgid "Report a Bug" -msgstr "Reportar um Erro" +msgstr "Relatar um Erro" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" @@ -256,7 +256,7 @@ msgstr "Contato" #: lib/bridgedb/templates/bridges.html:65 msgid "Uh oh, spaghettios!" -msgstr "Oh oh, Espaguettinhos" +msgstr "Ops, um erro!" #: lib/bridgedb/templates/bridges.html:70 msgid "There currently aren't any bridges available..." @@ -297,7 +297,7 @@ msgstr "Passo %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Agora, %s adicionar as pontes ao Navegador Tor %s" +msgstr "Agora, %s inserir as pontes no Navegador Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0