- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 12161: Quote arugments in launcher script.
by gk＠torproject.org 30 May '14

30 May '14

commit dbb4f9adac28b5be15ce55a02e0914918612b1f1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 30 08:36:35 2014 +0000 Bug 12161: Quote arugments in launcher script. Thanks for this patch, yar. --- RelativeLink/RelativeLink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index d4bd59c..a03c0e1 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -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! -./firefox -profile TorBrowser/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"

1 0

[tor-browser-bundle/maint-3.6] launch script: quote arguments with spaces
by gk＠torproject.org 30 May '14

30 May '14

commit d755aeec17412dda08c2ef352f1f45371e34aefd Author: yar <yardenack(a)gmail.com> Date: Thu May 29 15:17:51 2014 -0700 launch script: quote arguments with spaces --- RelativeLink/RelativeLink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 0d25a28..ad155f9 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -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 ${@} +./Browser/firefox -no-remote -profile Data/Browser/profile.default "${@}" exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser-bundle/master] Prune dead tags during git fetch.
by mikeperry＠torproject.org 29 May '14

29 May '14

commit 7d83e0fbd397c58013692f0db36c0532b2bfebaa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 13:27:20 2014 -0700 Prune dead tags during git fetch. fteproxy created and removed some crazy branches that managed to break git updates without a prune step. --- 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 9aff99d..34e8727 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 remote set-url origin $url && git fetch origin && git fetch --tags origin) + (cd "$dir" && git remote set-url origin $url && git fetch --prune origin && git fetch --prune --tags origin) else if ! git clone "$url"; then echo >&2 "Error: Cloning $url failed"

1 0

[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: 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-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] 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-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] 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

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

28 May '14

commit 429309ce162a0e1c36c9d3ed9c5bd89ca4879fd8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed May 28 09:14:02 2014 -0700 Remove scamblesuit bridges for now. They require Tor 0.2.5.x. Postpone adding them until we can branch off a maint-3.6 branch for TBB 3.6. --- 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 8d2afed..6d8ac38 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 8327587..87108bd 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,scramblesuit exec ./Tor/PluggableTransports/obfsproxy.bin managed +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 diff --git a/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 19fc8e0..7c6e6a5 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,scramblesuit exec PluggableTransports/obfsproxy.bin managed +ClientTransportPlugin obfs2,obfs3 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 bc1399d..049d2ff 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,scramblesuit exec Tor\PluggableTransports\obfsproxy managed +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed ## flash proxy configuration #

1 0

[tor-browser-bundle/master] Bug 10425: Adding the geoip6 files.
by gk＠torproject.org 28 May '14

28 May '14

commit 1ace63b0a4f9d74206e72f25e389f0f8a82f5416 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 28 09:56:37 2014 +0000 Bug 10425: Adding the geoip6 files. --- gitian/descriptors/linux/gitian-tor.yml | 1 + gitian/descriptors/mac/gitian-tor.yml | 8 +++++--- gitian/descriptors/windows/gitian-tor.yml | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 2b0b9ab..27e242b 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -92,6 +92,7 @@ script: | make $MAKEOPTS make install cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ + cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ # Strip and generate debuginfo for libs cd $INSTDIR objcopy --only-keep-debug $INSTDIR/bin/tor $INSTDIR/Debug/Tor/tor diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index be4edd2..054e1a8 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -53,7 +53,8 @@ script: | unzip -d $INSTDIR libevent-mac32-utils.zip cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` - # + + # Building tor # XXX Clean up these flags? export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" @@ -89,10 +90,11 @@ script: | 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/ i686-apple-darwin11-install_name_tool -change $INSTDIR/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor - # XXX: Geoip files.. - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh tor-mac32-gbuilt.zip TorBrowserBundle.app cp tor-mac32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index d3f1d4e..aea69b9 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -94,7 +94,7 @@ script: | cd .. install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ - # XXX: Geoip files.. + cp $INSTDIR/share/tor/geoip6 $INSTDIR/Data/Tor/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/Tor/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/Tor/

1 0

[tor-browser-bundle/master] Checkout tor-browser-builder-3 during fetch-input.sh
by mikeperry＠torproject.org 27 May '14

27 May '14

commit a9233e60ea2f8b80c42998800cc9e7324a7dfc5d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue May 27 08:40:24 2014 -0700 Checkout tor-browser-builder-3 during fetch-input.sh This may have been causing issues with the nightlies. --- gitian/fetch-inputs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 77356d7..0eceaf7 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -289,8 +289,8 @@ cd .. git remote set-url origin https://git.torproject.org/builders/gitian-builder.git git fetch origin git fetch --tags origin # XXX - why do we fetch tags specifically? -git checkout tor-browser-builder-2 -git merge origin/tor-browser-builder-2 +git checkout tor-browser-builder-3 +git merge origin/tor-browser-builder-3 cd inputs while read dir url tag; do

1 0

[tor-launcher/master] Bug #10425: geoip6 file is missing in TBB.
by brade＠torproject.org 27 May '14

27 May '14

commit 22ab705efb3fa112ad0e94d3792e23a508c71ace Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 27 11:27:25 2014 -0400 Bug #10425: geoip6 file is missing in TBB. When starting tor, pass the geoip6 file location (within the tor data dir) via the GeoIPv6File command line config option. --- src/components/tl-process.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 2efea99..4316a76 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -318,6 +318,9 @@ TorProcessService.prototype = var geoipFile = dataDir.clone(); geoipFile.append("geoip"); + var geoip6File = dataDir.clone(); + geoip6File.append("geoip6"); + var args = []; if (torrcDefaultsFile) { @@ -330,6 +333,8 @@ TorProcessService.prototype = args.push(dataDir.path); args.push("GeoIPFile"); args.push(geoipFile.path); + args.push("GeoIPv6File"); + args.push(geoip6File.path); args.push("HashedControlPassword"); args.push(hashedPassword);

1 0

[torbutton/master] Bug 11783: Avoid double-clicking on New Identity.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 0a2b0782af6e0d2608e2542542222764f31d9681 Author: Georg Koppen <gk(a)torproject.org> Date: Tue May 20 13:32:31 2014 +0000 Bug 11783: Avoid double-clicking on New Identity. It turns out that clicking several times on New Identity very quickly may lead to unexpected behavior, to errors like "TypeError: b.webProgress is undefined" and a somewhat broken browser: clicking on New Identity again after this error showed up shuts the browser down, for example. Thanks to a patch by a cypherpunk we disable the New Identity menuitem after the first click which resolves this issue. --- src/chrome/content/torbutton.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 43d5374..6161995 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1431,8 +1431,14 @@ function torbutton_send_ctrl_cmd(command) { // Bug 1506 P4: Needed for New Identity. function torbutton_new_identity() { try { + // Make sure that we can only click once on New Identiy to avoid race + // conditions leading to failures (see bug 11783 for an example). + document.getElementById("torbutton-new-identity").disabled = true; torbutton_do_new_identity(); } catch(e) { + // If something went wrong make sure we have the New Identity button + // enabled (again). + document.getElementById("torbutton-new-identity").disabled = false; torbutton_log(5, "Unexpected error on new identity: "+e); window.alert("Torbutton: Unexpected error on new identity: "+e); }

1 0

[torbutton/master] Bug 11722: Add hidden pref to force remote Tor check
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 9cc52477622b46fb76e0687a6d2f9770ccc8cf41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 26 10:41:46 2014 -0700 Bug 11722: Add hidden pref to force remote Tor check Some users may not have access to their Tor control port, and would prefer a remote Tor check instead, even if they are not using a transproxy. This pref allows them to specify this. --- src/chrome/content/torbutton.js | 3 ++- src/defaults/preferences/preferences.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 79b01ce..43d5374 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1744,7 +1744,8 @@ function torbutton_do_tor_check() // If we have a tor control port and transparent torification is off, // perform a check via the control port. if (m_tb_control_port && - !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor")) { + !m_tb_prefs.getBoolPref("extensions.torbutton.saved.transparentTor") && + m_tb_prefs.getBoolPref("extensions.torbutton.local_tor_check")) { if (torbutton_local_tor_check()) checkSvc.statusOfTorCheck = checkSvc.kCheckSuccessful; else { diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index bc63bb1..d2945c0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -26,6 +26,7 @@ pref("extensions.torbutton.socks_version",5); pref("extensions.torbutton.locked_mode",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); +pref("extensions.torbutton.local_tor_check",true); pref("extensions.torbutton.test_failed",false); pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://check.torproject.org/RecommendedTBBVersions");

1 0

[torbutton/master] Bug 11763: Fix race condition in pref dialog.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 377bc3d2b64d1cffcb863b534077882e7ef9af68 Author: Georg Koppen <gk(a)torproject.org> Date: Wed May 21 20:46:29 2014 +0000 Bug 11763: Fix race condition in pref dialog. If a user is clicking on the Accept button on the preferences dialog more than once the code in torbutton_prefs_save() is executed more than once as well which may lead to unexpected and unintended behavior. We fix this thanks to a patch by a cypherpunk by disabling the Accept button after the first click. --- src/chrome/content/preferences.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index e1b2bf5..4c3c74d 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -189,6 +189,10 @@ function torbutton_prefs_init(doc) { } function torbutton_prefs_save(doc) { + // Disable the Accept button once the user clicked on it as clicking on + // our active Accept button more than once can lead to all sort of weird + // behavior. See bug 11763 for an example. + doc.documentElement.getButton("accept").disabled = true; torbutton_log(2, "called prefs_save()"); var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.'); var o_customprefs = torbutton_get_prefbranch('extensions.torbutton.custom.');

1 0

[tor-browser/tor-browser-24.5.0esr-1] fixup! Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 26 May '14

26 May '14

commit 1bfe1ef04e14d677555db8009544736c24ddf299 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon May 26 10:19:36 2014 -0700 fixup! Tor Browser's Firefox preference overrides. Bug #11253: Turn on TLS 1.1 and 1.2. Also disable a deprecated Audio API for safety. --- browser/app/profile/000-tor-browser.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b6b9252..a6ff777 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -148,6 +148,13 @@ pref("javascript.options.baselinejit.content", false); pref("javascript.options.asmjs", false); pref("javascript.options.typeinference", false); +// Audio_data is deprecated in future releases, but still present +// in FF24. This is a dangerous combination (spotted by iSec) +pref("media.audio_data.enabled", false); + +// Enable TLS 1.1 and 1.2: +// https://trac.torproject.org/projects/tor/ticket/11253 +pref("security.tls.version.max", 3); // Version placeholder pref("torbrowser.version", "UNKNOWN");

1 0

[tor-launcher/master] Update translations.
by brade＠torproject.org 23 May '14

23 May '14

commit ed6e1481c83bfc692a719df583710a3ec45fda04 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 23 09:23:19 2014 -0400 Update translations. --- src/chrome/locale/bg/progress.dtd | 2 +- src/chrome/locale/ca/network-settings.dtd | 24 ++++++------ src/chrome/locale/ca/torlauncher.properties | 2 +- src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/el/torlauncher.properties | 2 +- src/chrome/locale/es-AR/torlauncher.properties | 50 ++++++++++++------------ src/chrome/locale/es-MX/network-settings.dtd | 2 +- src/chrome/locale/es-MX/torlauncher.properties | 18 ++++----- src/chrome/locale/es/torlauncher.properties | 4 +- src/chrome/locale/ko/network-settings.dtd | 18 ++++----- src/chrome/locale/ko/torlauncher.properties | 6 +-- src/chrome/locale/ms-MY/progress.dtd | 2 +- src/chrome/locale/pt-BR/torlauncher.properties | 8 ++-- src/chrome/locale/pt/torlauncher.properties | 2 +- src/chrome/locale/sv/torlauncher.properties | 2 +- src/chrome/locale/tr/network-settings.dtd | 22 +++++------ src/chrome/locale/tr/torlauncher.properties | 10 ++--- src/chrome/locale/zh-HK/network-settings.dtd | 2 +- src/chrome/locale/zh-HK/torlauncher.properties | 14 +++---- src/chrome/locale/zh-TW/network-settings.dtd | 2 +- src/chrome/locale/zh-TW/torlauncher.properties | 2 +- 21 files changed, 98 insertions(+), 98 deletions(-) diff --git a/src/chrome/locale/bg/progress.dtd b/src/chrome/locale/bg/progress.dtd index 26b2594..45a5ee3 100644 --- a/src/chrome/locale/bg/progress.dtd +++ b/src/chrome/locale/bg/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Състояние на Тор"> <!ENTITY torprogress.openSettings "Отвори настройки"> <!ENTITY torprogress.heading "Свързване с Тор мрежата"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Моля изчакайте,докато установим връзка с Тор мрежата."> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 51008c8..5cc6665 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -2,27 +2,27 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Abans de connectar-te a la xarxa Thor, necessites introduir informació sobre el ordinador que fas servir per la connexió a internet."> <!ENTITY torSettings.yes "Sí"> <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Necessito configurar un pont, el tallafocs o els paràmetres del proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Això funciona en la majoria dels casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyQuestion "Necessita aquest ordinador usar un proxy per accedir a internet?">  -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> +<!ENTITY torSettings.proxyHelp "Si no estas segur de com respondre a aquesta pregunta, observa els paràmetres d'Internet en un altre navegador per veure si està configurat per utilitzar un proxy."> <!ENTITY torSettings.enterProxy "Introdueix les opcions del proxy."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.firewallQuestion "La connexió d'aquest ordinador va a través d'un firewall que només permet les connexions per certs ports?"> +<!ENTITY torSettings.firewallHelp "Si no estas segur de com respondre a aquesta pregunta, selecciona no. Si tens problemes de connexió per la xarxa Tor, canvia aquest paràmetre."> +<!ENTITY torSettings.enterFirewall "Escriviu una llista separada per comes dels ports que estan permesos pel proxy."> +<!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> <!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> @@ -34,7 +34,7 @@ <!ENTITY torsettings.optional "Opcional "> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> +<!ENTITY torsettings.useProxy.checkbox "Aquest ordinador ha de fer servir un proxy per accedir a Internet"> <!ENTITY torsettings.useProxy.type "Tipus de Proxy:"> <!ENTITY torsettings.useProxy.address "Adreça:"> <!ENTITY torsettings.useProxy.address.placeholder "Direcció IP o nom del host"> @@ -44,21 +44,21 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> +<!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un proxy que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> <!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> <!ENTITY torsettings.copyLog "Copiar el Log al portapapers"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties index c423d03..d2e1d15 100644 --- a/src/chrome/locale/ca/torlauncher.properties +++ b/src/chrome/locale/ca/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=les identitats no coincideixen torlauncher.bootstrapWarning.timeout=S'ha excedit el temps d'espera de connexió torlauncher.bootstrapWarning.noroute=no hi ha ruta cap al servidor torlauncher.bootstrapWarning.ioerror=error de lectura/escriptura -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=falta de transport afegible diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 1e08971..d974db3 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -50,7 +50,7 @@ <!ENTITY torsettings.useBridges.type "Transport type:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> +<!ENTITY torsettings.useBridges.placeholder "zadej adresu:port"> <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties index f112828..e3f52f0 100644 --- a/src/chrome/locale/el/torlauncher.properties +++ b/src/chrome/locale/el/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=η ταυτότητα δεν ταιριά torlauncher.bootstrapWarning.timeout=λήξη χρονικού ορίου σύνδεσης torlauncher.bootstrapWarning.noroute=δεν βρέθηκε διαδρομή προς σύνδεση torlauncher.bootstrapWarning.ioerror=σφάλμα ανάγνωσης/εγγραφής -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Λείπει δυνατότητα σύνδεσης μεταφοράς. diff --git a/src/chrome/locale/es-AR/torlauncher.properties b/src/chrome/locale/es-AR/torlauncher.properties index 6ff39de..2b293e8 100644 --- a/src/chrome/locale/es-AR/torlauncher.properties +++ b/src/chrome/locale/es-AR/torlauncher.properties @@ -7,9 +7,9 @@ torlauncher.tor_exited=Salida inesperada de Tor torlauncher.please_restart_app=Por favor, reinicie esta aplicación torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control torlauncher.tor_failed_to_start=Fallo al iniciar Tor -torlauncher.tor_control_failed=Failed to take control of Tor. -torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. -torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). +torlauncher.tor_control_failed=Falló toma de control de Tor +torlauncher.tor_bootstrap_failed=Fallo al establecer una conexión con la red Tor +torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). torlauncher.unable_to_start_tor=No se puede iniciar Tor.\n\n%S torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor @@ -24,10 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet. torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=Debe seleccionar un tipo de transporte para los puentes provistos. +torlauncher.error_bridge_bad_default_type=No hay puentes disponibles que tengan el tipo de transporte %S. Por favor ajuste su configuración. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(recomendado) torlauncher.connect=Conectar torlauncher.quit=Quitar @@ -36,23 +36,23 @@ torlauncher.done=Hecho torlauncher.forAssistance=Para solicitar asistencia, contactese al %S -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory -torlauncher.bootstrapStatus.handshake_dir=Establishing an encrypted directory connection -torlauncher.bootstrapStatus.requesting_status=Retrieving network status -torlauncher.bootstrapStatus.loading_status=Loading network status -torlauncher.bootstrapStatus.loading_keys=Loading authority certificates -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.conn_dir=Conectando para retransmitir directorio +torlauncher.bootstrapStatus.handshake_dir=Estableciendo una conexión segura al directorio +torlauncher.bootstrapStatus.requesting_status=Regresando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_status=Cargando el estado de la red de trabajo +torlauncher.bootstrapStatus.loading_keys=Cargando certificados de dominio +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión +torlauncher.bootstrapStatus.loading_descriptors=Cargando información de retransmisión torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor -torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit -torlauncher.bootstrapStatus.done=Connected to the Tor network! - -torlauncher.bootstrapWarning.done=done -torlauncher.bootstrapWarning.connectrefused=connection refused -torlauncher.bootstrapWarning.misc=miscellaneous -torlauncher.bootstrapWarning.resourcelimit=insufficient resources -torlauncher.bootstrapWarning.identity=identity mismatch -torlauncher.bootstrapWarning.timeout=connection timeout -torlauncher.bootstrapWarning.noroute=no route to host -torlauncher.bootstrapWarning.ioerror=read/write error -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapStatus.handshake_or=Estableciendo una ruta Tor +torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! + +torlauncher.bootstrapWarning.done=finalizado +torlauncher.bootstrapWarning.connectrefused=conexión rechazada +torlauncher.bootstrapWarning.misc=misceláneo +torlauncher.bootstrapWarning.resourcelimit=recursos insuficientes +torlauncher.bootstrapWarning.identity=error de indentificación +torlauncher.bootstrapWarning.timeout=tiempo de espera de conexión +torlauncher.bootstrapWarning.noroute=sin ruta al servidor +torlauncher.bootstrapWarning.ioerror=error de lectura/escritura +torlauncher.bootstrapWarning.pt_missing=Perdida de la conectividad\n diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 5ada2f1..4eba7d2 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -37,7 +37,7 @@ <!ENTITY torsettings.useProxy.type "Proxy Type:"> <!ENTITY torsettings.useProxy.address "Address:"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Puerto:"> <!ENTITY torsettings.useProxy.username "Username:"> <!ENTITY torsettings.useProxy.password "Password:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> diff --git a/src/chrome/locale/es-MX/torlauncher.properties b/src/chrome/locale/es-MX/torlauncher.properties index 3ca3453..577f9ea 100644 --- a/src/chrome/locale/es-MX/torlauncher.properties +++ b/src/chrome/locale/es-MX/torlauncher.properties @@ -15,7 +15,7 @@ torlauncher.unable_to_start_tor=No se ha podido iniciar Tor.\n\n%S torlauncher.tor_missing=Falta el ejecutable de Tor. torlauncher.torrc_missing=Falta el archivo torrc. torlauncher.datadir_missing=El diccionario de datos de Tor no existe. -torlauncher.password_hash_missing=Failed to get hashed password. +torlauncher.password_hash_missing=No se pudo obtener la contraseña cifrada. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S @@ -24,7 +24,7 @@ torlauncher.ensure_tor_is_running=Por favor asegúrese que Tor esté en funciona torlauncher.error_proxy_addr_missing=Debes especificar ambos, una dirección IP o un hostname y un número de puerto para configurar Tor para usar un proxy y acceder a Internet torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de proxy. torlauncher.error_bridges_missing=Debes especificar uno o más puentes -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_default_bridges_type_missing=Debes seleccionar un tipo de transporte para los puentes proporcionados. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recomendado) @@ -34,25 +34,25 @@ torlauncher.quit=Abandonar torlauncher.quit_win=Salir torlauncher.done=Hecho -torlauncher.forAssistance=For assistance, contact %S +torlauncher.forAssistance=Si necesitas ayuda, contacta a %S -torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory +torlauncher.bootstrapStatus.conn_dir=Conectando a un directorio de retransmisión torlauncher.bootstrapStatus.handshake_dir=Estableciendo conexión con un directorio encriptado. torlauncher.bootstrapStatus.requesting_status=Recuperando estado de la red torlauncher.bootstrapStatus.loading_status=Cargando estado de red. torlauncher.bootstrapStatus.loading_keys=Cargando certificados de autoridad. -torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information -torlauncher.bootstrapStatus.loading_descriptors=Loading relay information +torlauncher.bootstrapStatus.requesting_descriptors=Solicitando información de retransmisión +torlauncher.bootstrapStatus.loading_descriptors=Cargando información del relé torlauncher.bootstrapStatus.conn_or=Conectando a la red Tor torlauncher.bootstrapStatus.handshake_or=Estableciendo un circuito Tor torlauncher.bootstrapStatus.done=¡Conectado a la red Tor! torlauncher.bootstrapWarning.done=hecho torlauncher.bootstrapWarning.connectrefused=Conexión rechazada -torlauncher.bootstrapWarning.misc=miscellaneous +torlauncher.bootstrapWarning.misc=miscelaneo torlauncher.bootstrapWarning.resourcelimit=Recursos insuficientes torlauncher.bootstrapWarning.identity=Identificar desajuste torlauncher.bootstrapWarning.timeout=Tiempo de conexión agotado -torlauncher.bootstrapWarning.noroute=no route to host +torlauncher.bootstrapWarning.noroute=no existe ruta al host torlauncher.bootstrapWarning.ioerror=error de lectura/escritura -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Falta un transporte conectable diff --git a/src/chrome/locale/es/torlauncher.properties b/src/chrome/locale/es/torlauncher.properties index 4c1fc30..c968541 100644 --- a/src/chrome/locale/es/torlauncher.properties +++ b/src/chrome/locale/es/torlauncher.properties @@ -11,8 +11,8 @@ torlauncher.tor_control_failed=Fallo al tomar control de Tor. torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión a la red Tor. torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S). -torlauncher.unable_to_start_tor=No fue posible iniciar Tor.\n\n%S -torlauncher.tor_missing=No se encuentra el fichero ejecutable de Tor. +torlauncher.unable_to_start_tor=Imposible iniciar Tor.\n\n%S +torlauncher.tor_missing=No se encuentra el archivo ejecutable de Tor. torlauncher.torrc_missing=No se encuentra el archivo "torrc" torlauncher.datadir_missing=El directorio de datos de Tor no existe. torlauncher.password_hash_missing=Fallo al obtener la contraseña cifrada. diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index 2af691c..4956dc5 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "브릿지, 방화벽, 프록시 설정 구성을 해야 합니다."> <!ENTITY torSettings.configure "구성"> <!ENTITY torSettings.connectPrompt2 "Tor 네트워크에 직접 연결하고 싶습니다."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "이것은 대부분의 상황에서 동작합니다"> <!ENTITY torSettings.connect "연결"> <!ENTITY torSettings.proxyQuestion "이 컴퓨터는 인터넷에 접속하는 데 프록시가 필요한가요?"> @@ -23,8 +23,8 @@ <!ENTITY torSettings.firewallHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 아니오를 선택하세요. Tor 네트워크에 접속할 때 문제를 만났다면 이 설정을 변경해 주세요."> <!ENTITY torSettings.enterFirewall "방화벽에 따라 허가되고 있는 포트 목록 입력해 주세요. 포트 번호는 콤마로 구분됩니다."> <!ENTITY torSettings.bridgeQuestion "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단하거나 검열하고 있나요?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeHelp "이 질문에 어떻게 대답해야할지 잘 모르는 경우 아니오를 선택하십시오.  예를 선택하면 Tor 네트워크에 대한 연결을 차단하는 것을 더욱 어렵게하는 목록 화되지 않은 릴레이이고 Tor Bridges을 구성하는 것이 요구됩니다."> +<!ENTITY torSettings.bridgeSettingsPrompt "제공된 브릿지 세트를 사용하거나 사용자 지정 브릿지 세트를 취득하여 입력 할 수 있습니다.">  @@ -47,7 +47,7 @@ <!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> <!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다."> <!ENTITY torsettings.useBridges.default "제공된 브릿지에 연결"> -<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.type "전송 유형:"> <!ENTITY torsettings.useBridges.custom "이용자 브릿지 접속"> <!ENTITY torsettings.useBridges.label "1개 이상의 브릿지 중계 서버를 입력해 주세요. (각 줄에 한 개씩)"> <!ENTITY torsettings.useBridges.placeholder "주소 입력 : 포트 번호"> @@ -55,10 +55,10 @@ <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기"> <!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말"> <!ENTITY torsettings.bridgeHelp1 "Tor 네트워크에 접속할 수 없는 경우, 귀하의 인터넷 서비스 공급자(ISP)나 별도의 기관이 Tor를 차단하고 있을 가능성이 있습니다.  그럴 때는 숨겨진 중계 서버를 통해 Tor 브릿지를 사용함으로써 이 문제를 해결할 수도 있습니다."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp1B "사전 설정되고 제공되어진 브릿지 주소 집합을 사용하거나 다음 세 가지 방법 중 하나를 사용하여 사용자 지정 주소의 집합을 검색 할 수 있습니다."> +<!ENTITY torsettings.bridgeHelp2Heading "웹을 통해"> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org 를 방문하십시오."> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3Heading "메일 자동 응답 시스템을 통해"> <!ENTITY torsettings.bridgeHelp3 "공개 브릿지 주소를 찾는 또 하나의 방법은 본문에 'get bridges'라고 적은 E-mail을 bridges(a)torproject.org 앞으로 보내는 것입니다.  단, 브릿지 주소를 크래커들이 수집하기 어렵게 하기 위해 gmail.com 이나 yahoo.com 으로 보내주시면 감사하겠습니다."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "헬프 데스크를 통해"> +<!ENTITY torsettings.bridgeHelp4 "최후의 수단으로 help(a)rt.torproject.xn--org-568n 정중 한 메일 메시지를 보내 브릿지 주소를 요청할 수 있습니다.  사람이 각 요청에 대응할 필요가 있다는 점에 주의해주십시오"> diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties index 8714f80..ed43d43 100644 --- a/src/chrome/locale/ko/torlauncher.properties +++ b/src/chrome/locale/ko/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시 torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다. torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오. torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=제공된 브리지의 전송 유형을 선택해야합니다. +torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공 한 브리지 유효한 것이 아닙니다. 설정을 조정하십시오. torlauncher.recommended_bridge=(권장함) @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=계정 불일치 torlauncher.bootstrapWarning.timeout=연결 타임아웃 torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류 -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=플러그가 가능한 전송을 찾을 수 없습니다 diff --git a/src/chrome/locale/ms-MY/progress.dtd b/src/chrome/locale/ms-MY/progress.dtd index fd2a975..f24ab09 100644 --- a/src/chrome/locale/ms-MY/progress.dtd +++ b/src/chrome/locale/ms-MY/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Buka tetapan."> <!ENTITY torprogress.heading "Menyambung ke rangkaian Tor."> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.pleaseWait "Sila tunggu sementara kami wujudkan sambung ke rangkaian Tor. "> diff --git a/src/chrome/locale/pt-BR/torlauncher.properties b/src/chrome/locale/pt-BR/torlauncher.properties index 5ab5499..5e9b860 100644 --- a/src/chrome/locale/pt-BR/torlauncher.properties +++ b/src/chrome/locale/pt-BR/torlauncher.properties @@ -19,13 +19,13 @@ torlauncher.password_hash_missing=Falha ao obter a senha criptografada. torlauncher.failed_to_get_settings=Impossível recuperar as configurações de Tor. torlauncher.failed_to_save_settings=Impossível salvar as configurações de Tor. -torlauncher.ensure_tor_is_running=Por favor, verifique que Tor esteja rodando. +torlauncher.ensure_tor_is_running=Por favor, verifique que Tor está sendo executado. torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou um servidor, e um número de porta para configurar Tor para usar um proxy de acesso a Internet. torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy. torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes. -torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para os bridges fornecidos. -torlauncher.error_bridge_bad_default_type=Nenhum dos bridges fornecidos tem disponível o tipo de transporte %S. Por favor ajuste suas configurações. +torlauncher.error_default_bridges_type_missing=Você deve selecionar um tipo de transporte para as pontes fornecidas. +torlauncher.error_bridge_bad_default_type=Entre as pontes fornecidas que têm o tipo de transporte %S, nenhuma está disponível. Por favor ajuste suas configurações. torlauncher.recommended_bridge=(recomendado) @@ -37,7 +37,7 @@ torlauncher.done=Terminado torlauncher.forAssistance=Para assistência, contacte torlauncher.bootstrapStatus.conn_dir=Conectando a um diretório de servidores -torlauncher.bootstrapStatus.handshake_dir=Estabelecendo conexão de diretório criptografado +torlauncher.bootstrapStatus.handshake_dir=Estabelecendo uma conexão de diretório criptografada torlauncher.bootstrapStatus.requesting_status=Recebendo estado da rede torlauncher.bootstrapStatus.loading_status=Carregando estado da rede torlauncher.bootstrapStatus.loading_keys=Carregando certificados de autoridade diff --git a/src/chrome/locale/pt/torlauncher.properties b/src/chrome/locale/pt/torlauncher.properties index 87b8aeb..780e44c 100644 --- a/src/chrome/locale/pt/torlauncher.properties +++ b/src/chrome/locale/pt/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identidade não correspondente torlauncher.bootstrapWarning.timeout=Tempo de ligação expirado torlauncher.bootstrapWarning.noroute=sem rota para o hospedeiro torlauncher.bootstrapWarning.ioerror=Erro de leitura/escrita -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Transporte de ligacao ausente diff --git a/src/chrome/locale/sv/torlauncher.properties b/src/chrome/locale/sv/torlauncher.properties index 375bd8c..1d89986 100644 --- a/src/chrome/locale/sv/torlauncher.properties +++ b/src/chrome/locale/sv/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=identitet felmatchad torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas torlauncher.bootstrapWarning.ioerror=läs-/skrivfel -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=Pluggable Transport saknas diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index 9e0aff5..7ac52b6 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -8,11 +8,11 @@ <!ENTITY torSettings.no "Hayır"> <!ENTITY torSettings.firstQuestion "Aşağıdakilerden hangisi durumunuzu en iyi açıklıyor?"> -<!ENTITY torSettings.configurePrompt1 "İnternet bağlantınız sansürlenmiş,filtrelenmiş veyahut proxylenmiş."> -<!ENTITY torSettings.configurePrompt2 "Köprü, güvenlik duvarı ve vekil sunucu ayarlarının konfigürasyonunu yapmam lazım."> +<!ENTITY torSettings.configurePrompt1 "İnternet bağlantınız sansürlenmiş, filtrelenmiş veya vekil sunucu altında."> +<!ENTITY torSettings.configurePrompt2 "Köprü, güvenlik duvarı ve vekil sunucu ayarlarını yapılandırmam gerekli."> <!ENTITY torSettings.configure "Yapılandır"> <!ENTITY torSettings.connectPrompt2 "Doğrudan Tor ağına bağlanmak istiyorum"> -<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumlarda çalışır."> +<!ENTITY torSettings.connectPrompt3 "Bu çoğu durumda çalışır."> <!ENTITY torSettings.connect "Bağlan"> <!ENTITY torSettings.proxyQuestion "Bu bilgisayarın İnternete erişirken bir vekil kullanması gerekiyor mu?"> @@ -22,8 +22,8 @@ <!ENTITY torSettings.firewallQuestion "Bu bilgisayarın İnternet bağlantısı, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarından geçiyor mu?"> <!ENTITY torSettings.firewallHelp "Eğer bu soruya nasıl cevap vereceğinizden emin değilseniz, Hayır seçin. Eğer Tor ağına bağlanırken sorunla karşılaşırsanız, bu ayarı değiştirin."> <!ENTITY torSettings.enterFirewall "Güvenlik duvarı tarafından izin verilen bağlantı noktalarının virgülle ayrılmış bir listesini girin."> -<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınızı (ISS) engellesin veya ayrıcaTor Bağlantınızı sansürlesin mi?"> -<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır 'ı Secin.  Eğer Evet'i seçerseniz, Tor Ağ bağlantıları engellemek için, daha zor hale getirilip listelenmeyen aktarmalar için Tor Köprülerini yapılandırmanız istenecektir."> +<!ENTITY torSettings.bridgeQuestion "İnternet Servis Sağlayıcınız (ISS) Tor Ağına bağlantıları engelliyor veya sansürlüyor mu?"> +<!ENTITY torSettings.bridgeHelp "Bu soruyu nasıl cevaplayacağınızdan emin değilseniz Hayır'ı Seçin.  Eğer Evet'i seçerseniz, Tor Ağına bağlantıyı engellemeyi daha zor hale getiren listelenmeyen aynalar olan Tor Köprülerini yapılandırmanız istenecektir."> <!ENTITY torSettings.bridgeSettingsPrompt "Sağlanan köprülerin kümesini kullanabilirsiniz veya özel bir köprü seti girebilir veya sağlayabilirsiniz.">  @@ -47,18 +47,18 @@ <!ENTITY torsettings.firewall.allowedPorts "İzin verilen portlar:"> <!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (İSS) Tor Ağı ile bağlantılarımı engelliyor"> <!ENTITY torsettings.useBridges.default "Sağlanan köprüler ile bağlan"> -<!ENTITY torsettings.useBridges.type "Taşıma türü:"> +<!ENTITY torsettings.useBridges.type "Aktarım türü:"> <!ENTITY torsettings.useBridges.custom "Özel köprüler girin"> <!ENTITY torsettings.useBridges.label "Bir veya daha fazla köprü aynası girin (her satıra bir tane)."> -<!ENTITY torsettings.useBridges.placeholder "adresi yazın:port"> +<!ENTITY torsettings.useBridges.placeholder "adresi:port şeklinde yazın"> <!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala"> <!ENTITY torsettings.bridgeHelpTitle "Köprü Ayna Yardımı"> -<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, nedeni kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.  Çoğunlukla bu problemi Tor köprüleri ile çözebilirisiniz bunlar engellenmesi daha zor olan listede olmayan aktarma noktalarıdır"> +<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.  Çoğunlukla bu problemi, engellenmesi daha zor listelenmeyen aynalar olan Tor Köprülerini kullanarak çözebilirsiniz."> <!ENTITY torsettings.bridgeHelp1B "Önceden yapılandırılan sağlanan köprü adresleri setini kullanabilirsiniz veya bu üç yöntemden birini kullanarak adres kümesinden özel bir set sağlayabilirsiniz:"> <!ENTITY torsettings.bridgeHelp2Heading "Web aracılığıyla."> <!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek için web tarayıcısı kullanın."> -<!ENTITY torsettings.bridgeHelp3Heading "Eposta otomatik cevaplandırıcı aracılığıyla."> -<!ENTITY torsettings.bridgeHelp3 "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.  Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu epostayı gmail.com veya yahoo.com adreslerinden yollamanız gerekmektedir."> +<!ENTITY torsettings.bridgeHelp3Heading "E-posta Otomatik Cevaplandırıcı Aracılığıyla"> +<!ENTITY torsettings.bridgeHelp3 "bridges(a)torproject.org adresine, iletide sadece 'get bridges' satırını yazarak bir e-posta gönderin.  Ancak, bir saldırganın çok sayıda köprü adresi öğrenmesini zorlaştırmak için bu e-postayı gmail.com veya yahoo.com adreslerinden yollamanız gerekmektedir."> <!ENTITY torsettings.bridgeHelp4Heading "Help Desk aracılığıyla."> -<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.&#160 Birisinin bu talebi cevaplayacağını unutmayın."> +<!ENTITY torsettings.bridgeHelp4 "Son bir çare olarak köprü adres taleplerini help(a)rt.torproject.org adresine posta göndererek rica edebilirsiniz.  Birisinin bu talebi cevaplayacağını unutmayın."> diff --git a/src/chrome/locale/tr/torlauncher.properties b/src/chrome/locale/tr/torlauncher.properties index 1a0226b..a8773d5 100644 --- a/src/chrome/locale/tr/torlauncher.properties +++ b/src/chrome/locale/tr/torlauncher.properties @@ -21,11 +21,11 @@ torlauncher.failed_to_get_settings=Tor ayarlarına ulaşılamıyor.\n\n%S torlauncher.failed_to_save_settings=Tor ayarları kaydedilemiyor.\n\n%S torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun. -torlauncher.error_proxy_addr_missing=İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor. +torlauncher.error_proxy_addr_missing=İnternet bağlanırken vekil sunucu kullanmak için IP adresi veya sunucu ve bağlantı noktası numarası girmeniz gerekiyor. torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz. torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz. -torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir taşıma türü seçmelisiniz. -torlauncher.error_bridge_bad_default_type=%S taşıma türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. +torlauncher.error_default_bridges_type_missing=Sağlanan köprüler için bir aktarım türü seçmelisiniz. +torlauncher.error_bridge_bad_default_type=%S aktarım türü için sağlanan kullanılabilir köprüler yok. Ayarlarınızı lütfen ayarlayın. torlauncher.recommended_bridge=(önerilen) @@ -36,10 +36,10 @@ torlauncher.done=Tamamlandı torlauncher.forAssistance=Yardım için %S ile bağlantıya geçin. -torlauncher.bootstrapStatus.conn_dir=Aktarım klasörüne bağlanıyor +torlauncher.bootstrapStatus.conn_dir=Bir ayna dizinine bağlanıyor torlauncher.bootstrapStatus.handshake_dir=Şifrelenmiş dizin bağlantısı kuruluyor torlauncher.bootstrapStatus.requesting_status=Ağ durumu güncelliyor -torlauncher.bootstrapStatus.loading_status=Ağ yükleniyor +torlauncher.bootstrapStatus.loading_status=Ağ durumu yükleniyor torlauncher.bootstrapStatus.loading_keys=Doğrulama sertifikalarını yüklüyor torlauncher.bootstrapStatus.requesting_descriptors=Ayna bilgisi isteniyor torlauncher.bootstrapStatus.loading_descriptors=Ayna bilgisi yükleniyor diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 3d7463a..c71c117 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -13,7 +13,7 @@ <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> <!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.connect "連接"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index d088f8d..278038e 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -1,10 +1,10 @@ ### Copyright (c) 2014, The Tor Project, Inc. ### See LICENSE for licensing information. -torlauncher.error_title=Tor Launcher +torlauncher.error_title=Tor啟動器 torlauncher.tor_exited=Tor unexpectedly exited. -torlauncher.please_restart_app=Please restart this application. +torlauncher.please_restart_app=請重新啟動此程式。 torlauncher.tor_controlconn_failed=Could not connect to Tor control port. torlauncher.tor_failed_to_start=Tor failed to start. torlauncher.tor_control_failed=Failed to take control of Tor. @@ -19,7 +19,7 @@ torlauncher.password_hash_missing=Failed to get hashed password. torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. +torlauncher.ensure_tor_is_running=請確定Tor運作中。 torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. @@ -27,12 +27,12 @@ torlauncher.error_bridges_missing=You must specify one or more bridges. torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. -torlauncher.recommended_bridge=(recommended) +torlauncher.recommended_bridge=(建議) -torlauncher.connect=Connect +torlauncher.connect=連接 torlauncher.quit=離開 torlauncher.quit_win=離開 -torlauncher.done=Done +torlauncher.done=完成 torlauncher.forAssistance=For assistance, contact %S @@ -47,7 +47,7 @@ torlauncher.bootstrapStatus.conn_or=連接上Tor的網絡 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! -torlauncher.bootstrapWarning.done=done +torlauncher.bootstrapWarning.done=完成 torlauncher.bootstrapWarning.connectrefused=connection refused torlauncher.bootstrapWarning.misc=miscellaneous torlauncher.bootstrapWarning.resourcelimit=insufficient resources diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 6fcb103..6d66ac6 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.firewallHelp "若您無法確定如何回答這個問題，請選擇「否」。若您在連結至 Tor 網路時遭遇問題，請再改變此設定。"> <!ENTITY torSettings.enterFirewall "請輸入防火牆允許的連線埠（請以逗號分隔）。"> <!ENTITY torSettings.bridgeQuestion "您的網路供應商 (ISP) 阻擋或者審查 Tor 網路連線？"> -<!ENTITY torSettings.bridgeHelp "如果你不知道如何回答這個問題，請選擇「否」&#160；如果你選擇選擇「是」，你將被要求設定Tor網橋，這可以讓阻擋客戶端與Tor伺服器的連接更困難。"> +<!ENTITY torSettings.bridgeHelp "如果你不知道如何回答這個問題，請選擇「否」  如果你選擇選擇「是」，你將被要求設定Tor網橋，這可以讓阻擋客戶端與Tor伺服器的連接更困難。"> <!ENTITY torSettings.bridgeSettingsPrompt "您可以使用預設的網橋或者你可以使用自定義設置的網橋。">  diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties index 1abca51..433b0dd 100644 --- a/src/chrome/locale/zh-TW/torlauncher.properties +++ b/src/chrome/locale/zh-TW/torlauncher.properties @@ -55,4 +55,4 @@ torlauncher.bootstrapWarning.identity=身分不一致 torlauncher.bootstrapWarning.timeout=連線逾時 torlauncher.bootstrapWarning.noroute=無連結至 host 的路徑 torlauncher.bootstrapWarning.ioerror=讀寫錯誤 -torlauncher.bootstrapWarning.pt_missing=missing pluggable transport +torlauncher.bootstrapWarning.pt_missing=缺少可插拔傳輸

1 0

[tor-launcher/master] Bug #11754: untranslated locales in Tor Launcher
by brade＠torproject.org 23 May '14

23 May '14

commit 486cf961965e724632b86d44623949458aaeffe2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri May 23 09:02:32 2014 -0400 Bug #11754: untranslated locales in Tor Launcher Remove locales that have been removed from Transifex. --- src/chrome/locale/af-ZA/network-settings.dtd | 64 -------------------- src/chrome/locale/am-ET/network-settings.dtd | 64 -------------------- src/chrome/locale/bg-BG/network-settings.dtd | 64 -------------------- src/chrome/locale/bn-BD/network-settings.dtd | 64 -------------------- src/chrome/locale/ca-ES/network-settings.dtd | 59 ------------------ src/chrome/locale/cs-CZ/network-settings.dtd | 64 -------------------- src/chrome/locale/el-GR/network-settings.dtd | 64 -------------------- src/chrome/locale/es-NI/network-settings.dtd | 64 -------------------- src/chrome/locale/sq-AL/network-settings.dtd | 64 -------------------- .../locale/zh-CN.GB2312/network-settings.dtd | 59 ------------------ src/chrome/locale/zh/network-settings.dtd | 59 ------------------ 11 files changed, 689 deletions(-) diff --git a/src/chrome/locale/af-ZA/network-settings.dtd b/src/chrome/locale/af-ZA/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/af-ZA/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/bg-BG/network-settings.dtd b/src/chrome/locale/bg-BG/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/bg-BG/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/ca-ES/network-settings.dtd b/src/chrome/locale/ca-ES/network-settings.dtd deleted file mode 100644 index 3c3433e..0000000 --- a/src/chrome/locale/ca-ES/network-settings.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Adreça:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/el-GR/network-settings.dtd b/src/chrome/locale/el-GR/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/el-GR/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/es-NI/network-settings.dtd b/src/chrome/locale/es-NI/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/es-NI/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd deleted file mode 100644 index a346274..0000000 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ /dev/null @@ -1,64 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "type address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd deleted file mode 100644 index 899a543..0000000 --- a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/zh/network-settings.dtd b/src/chrome/locale/zh/network-settings.dtd deleted file mode 100644 index 899a543..0000000 --- a/src/chrome/locale/zh/network-settings.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> - - - -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> - -<!ENTITY torSettings.yes "Yes"> -<!ENTITY torSettings.no "No"> - -<!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> - -<!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?"> - -<!ENTITY torSettings.proxyHelp "If you are not sure how to answer this question, look at the Internet settings in another browser to see whether it is configured to use a proxy."> -<!ENTITY torSettings.enterProxy "Enter the proxy settings."> -<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> -<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> -<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> -<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.  If not, just click Connect."> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> -<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request.">

1 0

[tor-browser-bundle/master] Increase some component versions for 3.6.2.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit b428d32a7f014d53235750ec2a1634c6937fd5ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:33:46 2014 -0700 Increase some component versions for 3.6.2. We may also bump torbutton and tor launcher later. --- gitian/versions | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitian/versions b/gitian/versions index a9e033f..6424316 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6.1 +TORBROWSER_VERSION=3.6.2pre BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -7,10 +7,10 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.5.0esr TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build4 -TOR_TAG=tor-0.2.4.21 +TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.4 TORBUTTON_TAG=1.6.9.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.4.5 # XXX: HTTPSE_VER is used instead, pending #11630 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable @@ -18,8 +18,8 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.6 OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 -LIBFTE_TAG=19f6b8ffafca2ec8fffbc418bc0f88518cea22ac # tag 0.0.2 -FTEPROXY_TAG=b5d7fba5c505907693fd2b5321f2aa57d4390cfa # 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

1 0

[tor-browser-bundle/master] Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit cc1cff02f7c8b930bdcf03abc1a3a1cd5800d427 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 09:13:24 2014 -0700 Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch. --- gitian/descriptors/linux/gitian-tor.yml | 2 -- gitian/descriptors/mac/gitian-tor.yml | 2 -- gitian/descriptors/windows/gitian-tor.yml | 2 -- gitian/patches/bug9229.patch | 46 ----------------------------- 4 files changed, 52 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 4a8f08e..2b0b9ab 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -24,7 +24,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -75,7 +74,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 90f56e0..be4edd2 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -21,7 +21,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -70,7 +69,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 19c4acd..d3f1d4e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -22,7 +22,6 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" -- "bug9229.patch" - "bug11156.patch" - "bug11200.patch" - "bug11069.patch" @@ -72,7 +71,6 @@ script: | if [ $BUILD_PT_BUNDLES ]; then if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then - git am ~/build/bug9229.patch git am ~/build/bug5018.patch git am ~/build/bug11069.patch git am ~/build/bug11156.patch diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch deleted file mode 100644 index 6b1115c..0000000 --- a/gitian/patches/bug9229.patch +++ /dev/null @@ -1,46 +0,0 @@ -From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001 -From: Nick Mathewson <nickm(a)torproject.org> -Date: Mon, 10 Mar 2014 15:01:27 -0400 -Subject: [PATCH] Update ns downloads when we receive a bridge descriptor - -This prevents long stalls when we're starting with a state file but -with no bridge descriptors. Fixes bug 9229. I believe this bug has -been present since 0.2.0.3-alpha. ---- - changes/bug9229 | 5 +++++ - src/or/entrynodes.c | 6 +++++- - 2 files changed, 10 insertions(+), 1 deletion(-) - create mode 100644 changes/bug9229 - -diff --git a/changes/bug9229 b/changes/bug9229 -new file mode 100644 -index 0000000..ad7fd22 ---- /dev/null -+++ b/changes/bug9229 -@@ -0,0 +1,5 @@ -+ o Minor bugfixes: -+ - Avoid 60-second delays in the bootstrapping process when Tor -+ is launching for a second time while using bridges. Fixes bug 9229; -+ bugfix on 0.2.0.3-alpha. -+ -diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c -index 2aa063c..59770fa 100644 ---- a/src/or/entrynodes.c -+++ b/src/or/entrynodes.c -@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) - * our entry node list */ - entry_guard_register_connect_status(ri->cache_info.identity_digest, - 1, 0, now); -- if (first) -+ if (first) { -+ /* XXXX apparently, this is never called. See bug #9229. */ - routerlist_retry_directory_downloads(now); -+ } -+ -+ update_networkstatus_downloads(now); - } - } - } --- -1.8.1.2 -

1 0

[tor-browser-bundle/master] Add support for scramblesuit, add in default bridge lines.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit ef80bcdfd15ba873de6c7a88382176b893770638 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:20:27 2014 -0700 Add support for scramblesuit, add in default bridge lines. --- Bundle-Data/PTConfigs/bridge_prefs.js | 4 ++++ 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, 7 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index f14cf07..8d2afed 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -21,3 +21,7 @@ pref("extensions.torlauncher.default_bridge.fte.2", "fte 128.105.214.162:8080 FC pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.163:8080 A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9"); 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"); 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

[tor-browser-bundle/master] Update bug11156 patch with fix from #11654.
by mikeperry＠torproject.org 23 May '14

23 May '14

commit fcd3be303a9786574c42635e124d294e7abf77c4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 22 08:16:07 2014 -0700 Update bug11156 patch with fix from #11654. --- gitian/patches/bug11156.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch index 33dacad..d9f8e7a 100644 --- a/gitian/patches/bug11156.patch +++ b/gitian/patches/bug11156.patch @@ -249,3 +249,27 @@ index c2d6545..551b09f 100644 -- 1.8.1.2 +From dfcbc4500aad07a641e9e856d442c848d86d2c7e Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Thu, 1 May 2014 17:32:29 +0100 +Subject: [PATCH] fixup! Fix a misuse of strlcpy() introduced by the #11156 + patch. + +--- + changes/bug11654 | 4 ++++ + 1 file changed, 4 insertions(+) + create mode 100644 changes/bug11654 + +diff --git a/changes/bug11654 b/changes/bug11654 +new file mode 100644 +index 0000000..97c70b2 +--- /dev/null ++++ b/changes/bug11654 +@@ -0,0 +1,4 @@ ++ o Minor bugfixes: ++ - Fix a broken log message about delayed directory fetches that ++ was caused by a misuse of strlcpy(). Fixes bug 11654; bugfix on ++ 0.2.5.3-alpha. +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Bug 11190: Workaround for broken obfs on OS X.
by gk＠torproject.org 22 May '14

22 May '14

commit 5f671fa272219e1ecaf15d5d22a41c16aec64dae Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 22 12:24:25 2014 +0000 Bug 11190: Workaround for broken obfs on OS X. --- gitian/descriptors/mac/gitian-pluggable-transports.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 52dd403..59109a7 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -151,6 +151,8 @@ script: | cp -a bin/obfsproxy $PTDIR/obfsproxy.bin mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy + # XXX: Workaround for bug 11190 + sed 's/python2/python/' -i $PTDIR/obfsproxy.bin cd .. # Building M2Crypto

1 0

[tor-browser-bundle/master] Bug 10120: Part 4: Refactor PT descriptors.
by gk＠torproject.org 22 May '14

22 May '14

commit 90d598f9dcd0758fd9c72f4b30286982017dd18d Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 22 12:06:04 2014 +0000 Bug 10120: Part 4: Refactor PT descriptors. We build GMP separately and preserve it now as well. Apart from that we use the already built OpenSSL in the PT descriptors and leave other requirements for PTs alone: the overhead building them every time is not that high and they might be changing more often than the other utilities we preserve. Additionally, the descriptors got cleaned-up a bit. --- .../linux/gitian-pluggable-transports.yml | 81 +++++----- gitian/descriptors/linux/gitian-tor.yml | 11 +- gitian/descriptors/linux/gitian-utils.yml | 20 ++- .../mac/gitian-pluggable-transports.yml | 111 +++++++------- gitian/descriptors/mac/gitian-tor.yml | 1 + gitian/descriptors/mac/gitian-utils.yml | 13 ++ .../windows/gitian-pluggable-transports.yml | 154 ++++++++++---------- gitian/descriptors/windows/gitian-tor.yml | 8 +- gitian/descriptors/windows/gitian-utils.yml | 12 +- gitian/mkbundle-linux.sh | 8 +- gitian/mkbundle-mac.sh | 5 +- gitian/mkbundle-windows.sh | 5 +- 12 files changed, 231 insertions(+), 198 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index eb9ca16..b2d57c0 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -5,7 +5,7 @@ suites: architectures: - "i386" - "amd64" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -30,8 +30,6 @@ remotes: - "url": "https://github.com/habnabit/txsocksx.git" "dir": "txsocksx" files: -- "openssl.tar.gz" -- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "pyyaml.tar.gz" @@ -40,77 +38,81 @@ files: - "m2crypto.tar.gz" - "parsley.tar.gz" - "dzip.sh" +- "gmp-linux32-utils.zip" +- "gmp-linux64-utils.zip" +- "openssl-linux32-utils.zip" +- "openssl-linux64-utils.zip" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" - export LIBRARY_PATH="$INSTDIR/lib" + mkdir -p $PTDIR + mkdir -p $INSTDIR/Debug/ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C export PYTHON=python2 umask 0022 - # + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - # - mkdir -p $PTDIR - mkdir -p $INSTDIR/Debug/ - # - tar xvf gmp.tar.bz2 - cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - make - make install - cp -an $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor - cd .. - # + + unzip -d $INSTDIR gmp-linux$GBUILD_BITS-utils.zip + unzip -d $INSTDIR openssl-linux$GBUILD_BITS-utils.zip + cp $INSTDIR/gmp/lib/*.so* $INSTDIR/Tor + + # Building pyptlib cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. - # + + # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. - # + + # Building argparse tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. - # + + # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. - # + + # Building PyYAML tar xzf pyyaml.tar.gz cd PyYAML-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/yaml $PTDIR/ cd .. - # + + # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. - # + + # Building Parsley tar xzf parsley.tar.gz cd Parsley-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -119,7 +121,8 @@ script: | cp -a build/ometa $PTDIR/ cp -a build/terml $PTDIR/ cd .. - # + + # Building txsocksx cd txsocksx find -type f | xargs touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get @@ -130,7 +133,8 @@ script: | $PYTHON setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. - # + + # Building obfsproxy cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build @@ -139,16 +143,8 @@ script: | mkdir -p $INSTDIR/Docs/Obfsproxy cp -a {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # - tar xzf openssl.tar.gz - cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - #./Configure -shared --prefix=$INSTDIR/openssl linux-elf - ./config -shared --prefix=$INSTDIR/openssl - make - make install - cd .. - # + + # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -156,7 +152,8 @@ script: | $PYTHON setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ cd .. - # + + # Building flashproxy cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client @@ -164,7 +161,8 @@ script: | mkdir -p $INSTDIR/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. - # + + # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -174,7 +172,8 @@ script: | cp -a {LICENSE,README.md} $INSTDIR/Docs/libfte cp -a thirdparty/re2/LICENSE $INSTDIR/Docs/libfte/LICENSE.re2 cd .. - # + + # Building fteproxy cd fteproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin @@ -182,9 +181,9 @@ script: | mkdir -p $INSTDIR/Docs/fteproxy cp -a {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. - # + + # Grabbing the results cd $INSTDIR - # ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-gbuilt.zip Tor/ Docs/ ~/build/dzip.sh pluggable-transports-linux$GBUILD_BITS-debug.zip Debug/ cp pluggable-transports-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 44c2b1f..4a8f08e 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -44,14 +44,14 @@ script: | export TZ=UTC export LC_ALL=C umask 0022 - # + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 export DEB_BUILD_HARDENING_FORTIFY=1 export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 - # + mkdir -p $INSTDIR/Data/Tor/ mkdir -p $INSTDIR/Tor/ mkdir -p $INSTDIR/Debug/Tor/ @@ -60,9 +60,9 @@ script: | cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ - # chmod 700 $INSTDIR/Tor/*so* - # + + # Building tor cd tor git update-index --refresh -q export GIT_COMMITTER_NAME="nobody" @@ -106,7 +106,8 @@ script: | strip $INSTDIR/Tor/$LIB objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - # + + # Grabbing the results ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ Tor/ ~/build/dzip.sh tor-linux$GBUILD_BITS-debug.zip Debug/ cp tor-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-utils.yml b/gitian/descriptors/linux/gitian-utils.yml index 9bbae76..34b1672 100644 --- a/gitian/descriptors/linux/gitian-utils.yml +++ b/gitian/descriptors/linux/gitian-utils.yml @@ -25,11 +25,12 @@ remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" files: -- "versions" -- "dzip.sh" - "openssl.tar.gz" - "python.tar.bz2" - "lxml.tar.gz" +- "gmp.tar.bz2" +- "versions" +- "dzip.sh" script: | INSTDIR="$HOME/install" source versions @@ -38,7 +39,7 @@ script: | export TZ=UTC export LC_ALL=C umask 0022 - # + # Config options for hardening-wrapper export DEB_BUILD_HARDENING=1 export DEB_BUILD_HARDENING_STACKPROTECTOR=1 @@ -80,7 +81,7 @@ script: | make $MAKEOPTS altinstall prefix=$INSTDIR/python exec-prefix=$INSTDIR/python cd .. - # Building the Python lxml module + # Building lxml tar xzf lxml.tar.gz cd lxml-* # Make sure we use our freshly built python binary here. Otherwise bad things @@ -92,10 +93,19 @@ script: | cp *utils.zip $OUTDIR cd ../../../ + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cd .. + # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-linux$GBUILD_BITS-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-linux$GBUILD_BITS-utils.zip libevent ~/build/dzip.sh python-$PYTHON_VER-linux$GBUILD_BITS-utils.zip python - + ~/build/dzip.sh gmp-$GMP_VER-linux$GBUILD_BITS-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 48521d8..52dd403 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -14,7 +14,6 @@ packages: - "python-dev" - "faketime" - "libtool" -#- "libssl0.9.8" reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://git.torproject.org/pluggable-transports/pyptlib.git" @@ -30,8 +29,6 @@ remotes: - "url": "https://github.com/habnabit/txsocksx.git" "dir": "txsocksx" files: -- "openssl.tar.gz" -- "gmp.tar.bz2" - "pycrypto.tar.gz" - "argparse.tar.gz" - "pyyaml.tar.gz" @@ -42,56 +39,45 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" -#- "apple-x86-gcc_4.2.1~5646.1flosoft2_i386.deb" -#- "apple-x86-odcctools_758.159-0flosoft11_i386.deb" +- "gmp-mac32-utils.zip" +- "openssl-mac32-utils.zip" script: | INSTDIR="$HOME/install" PTDIR="$INSTDIR/TorBrowserBundle.app/Tor/PluggableTransports" - export LIBRARY_PATH="$INSTDIR/lib" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 # - #export CFLAGS="-isysroot /usr/lib/apple/SDKs/MacOSX10.6.sdk/" - #export CXXFLAGS=$CFLAGS - #export LDFLAGS=$CFLAGS - export PATH="$PATH:/usr/apple-osx/bin/" - export AR=/usr/apple-osx/bin/i686-apple-darwin11-ar - export CC=/usr/apple-osx/bin/i686-apple-darwin11-gcc - export CXX=/usr/apple-osx/bin/i686-apple-darwin11-g++ - # http://bugs.python.org/issue9437 - export LDSHARED="$CC -pthread -shared" - export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" - export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" - export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" - # mkdir -p $PTDIR/ mkdir -p $OUTDIR/ # sudo dpkg -i *.deb - cd /usr - sudo tar -Jxvf /home/ubuntu/build/multiarch-darwin*tar.xz - cd ~/build - # For OpenSSL - sudo ln -s /usr/apple-osx/bin/apple-osx-gcc /usr/apple-osx/bin/i686-apple-darwin11-cc - # - tar xvf gmp.tar.bz2 - cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx - make - make install + tar xaf multiarch-darwin*tar.xz + 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/ - cd .. # + export AR=$HOME/build/apple-osx/bin/i686-apple-darwin11-ar + export CC=$HOME/build/apple-osx/bin/i686-apple-darwin11-gcc + export CXX=$HOME/build/apple-osx/bin/i686-apple-darwin11-g++ + # http://bugs.python.org/issue9437 + export LDSHARED="$CC -pthread -shared" + # XXX Clean up these flags? + export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" + export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5 -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -I$INSTDIR/gmp/include -L$INSTDIR/gmp/lib" + export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -F/usr/lib/apple/SDKs/MacOSX10.6.sdk/System/Library/Frameworks -mmacosx-version-min=10.5" + + # Building pyptlib cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/pyptlib $PTDIR/ cd .. - # + + # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -101,28 +87,32 @@ script: | python setup.py build --build-lib build cp -a build/Crypto $PTDIR/ cd .. - # + + # Building argparse tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/argparse.py $PTDIR/ cd .. - # - tar xzf pyyaml.tar.gz - cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - python setup.py build --build-lib build - cp -a build/yaml $PTDIR/ - cd .. - # + + # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build cp -a build/zope $PTDIR/ cd .. - # + + # Building PyYAML + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/yaml $PTDIR/ + cd .. + + # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -130,7 +120,8 @@ script: | python setup.py build --build-lib build cp -a build/twisted $PTDIR/ cd .. - # + + # Building Parsley tar xzf parsley.tar.gz cd Parsley-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -139,7 +130,8 @@ script: | cp -a build/ometa $PTDIR/ cp -a build/terml $PTDIR/ cd .. - # + + # Building txsocksx cd txsocksx find -type f | xargs touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get @@ -150,7 +142,8 @@ script: | python setup.py build --build-lib build cp -a build/txsocksx $PTDIR/ cd .. - # + + # Building obfsproxy cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build @@ -159,16 +152,8 @@ script: | mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cp -a {LICENSE,README} $INSTDIR/TorBrowserBundle.app/Docs/Obfsproxy cd .. - # - tar xzf openssl.tar.gz - cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - CC=cc ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl - make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" - make install - #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ - cd .. - # + + # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -182,7 +167,8 @@ script: | python setup.py build --build-lib build cp -a build/M2Crypto $PTDIR/ cd .. - # + + # Building flashproxy cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist DISTNAME=flashproxy-client @@ -190,7 +176,8 @@ script: | mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cp -a {doc/*,README,LICENSE,ChangeLog} $INSTDIR/TorBrowserBundle.app/Docs/FlashProxy cd .. - # + + # Building libfte cd libfte 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 @@ -199,7 +186,8 @@ script: | cp -a {LICENSE,README.md} $INSTDIR/TorBrowserBundle.app/Docs/libfte cp -an thirdparty/re2/LICENSE $INSTDIR/TorBrowserBundle.app/Docs/libfte/LICENSE.re2 cd .. - # + + # Building fteproxy cd fteproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" cp -a bin/fteproxy $PTDIR/fteproxy.bin @@ -207,7 +195,8 @@ script: | mkdir -p $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cp -a {COPYING,README.md} $INSTDIR/TorBrowserBundle.app/Docs/fteproxy cd .. - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh pluggable-transports-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app cp pluggable-transports-mac$GBUILD_BITS-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index b8a761b..90f56e0 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -55,6 +55,7 @@ script: | cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` # + # XXX Clean up these flags? export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" cd tor diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index 1caf8f0..3c6e4a7 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -21,6 +21,7 @@ files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "openssl.tar.gz" +- "gmp.tar.bz2" - "versions" - "dzip.sh" script: | @@ -38,7 +39,9 @@ script: | # For OpenSSL ln -s ~/build/apple-osx/bin/apple-osx-gcc ~/build/apple-osx/bin/i686-apple-darwin11-cc + # XXX Clean up these flags? export CFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" + export CXXFLAGS="-I/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/include/ -I/usr/lib/gcc/i686-apple-darwin10/4.2.1/include/ -I. -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/i686-apple-darwin10/4.2.1 -mmacosx-version-min=10.5" export LDFLAGS="-L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/ -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/system/ -mmacosx-version-min=10.5" # Building Libevent @@ -62,9 +65,19 @@ script: | make install cd .. + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --host=i686-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + make + make install + cd .. + # Grabbing the results cd $INSTDIR ~/build/dzip.sh openssl-$OPENSSL_VER-mac32-utils.zip openssl ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-mac32-utils.zip libevent + ~/build/dzip.sh gmp-$GMP_VER-mac32-utils.zip gmp cp *utils.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1637b23..6af344c 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -31,8 +31,6 @@ remotes: - "url": "https://github.com/habnabit/txsocksx.git" "dir": "txsocksx" files: -- "openssl.tar.gz" -- "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" - "argparse.tar.gz" @@ -47,16 +45,38 @@ files: - "py2exe.exe" - "dzip.sh" - "pyc-timestamp.sh" +- "openssl-win32-utils.zip" +- "gmp-win32-utils.zip" script: | + # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. + function py2exe_zip_timestomp { + ZIPFILE="$1" + local tmpdir="$(mktemp -d)" + local tmpzip="$(mktemp -u)" + unzip -d "$tmpdir" "$ZIPFILE" + cd "$tmpdir" + find . -name '*.pyc' -print0 | xargs -0 ~/build/pyc-timestamp.sh "$REFERENCE_DATETIME" + ~/build/dzip.sh "$tmpzip" . + cd - + mv -f "$tmpzip" "$ZIPFILE" + rm -rf "$tmpdir" + } + INSTDIR="$HOME/install" PTDIR="$INSTDIR/Tor/PluggableTransports" - export LIBRARY_PATH="$INSTDIR/lib" + mkdir -p $INSTDIR/bin/ + mkdir -p $PTDIR/ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C export CFLAGS="-mwindows" export LDFLAGS="-mwindows" + umask 0022 + + unzip -d $INSTDIR gmp-win32-utils.zip + unzip -d $INSTDIR openssl-win32-utils.zip + cp $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor # We need at least Wine 1.5.29 which is not in Ubuntu's main repository (see # below). Thus, we resort to a PPA and need therefore to determine the correct @@ -69,47 +89,13 @@ script: | # KVM MIRROR_HOST=10.0.2.2 fi - + # Install a Wine new enough to have a fix for + # http://bugs.winehq.org/show_bug.cgi?id=29764; otherwise Python run under + # Wine constantly crashes in _PyVerify_fd, which is called by such common + # operations as io.open and os.fstat (anything involving a file descriptor + # number). Ubuntu's main repository only has wine1.4, and the issue was fixed + # in 1.5.29. WINEROOT=$HOME/.wine/drive_c - # XXX: Hardening options cause the exe's to crash.. not sure why - #export CFLAGS="-mwindows -fstack-protector-all -fPIE -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat-security" - #export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -lssp -L/usr/lib/gcc/i686-w64-mingw32/4.6/" - umask 0022 - # - mkdir -p $INSTDIR/bin/ - mkdir -p $PTDIR/ - mkdir -p $OUTDIR/ - # - # Set the timestamp on every .pyc file in a zip file, and re-dzip the zip file. - function py2exe_zip_timestomp { - ZIPFILE="$1" - local tmpdir="$(mktemp -d)" - local tmpzip="$(mktemp -u)" - unzip -d "$tmpdir" "$ZIPFILE" - cd "$tmpdir" - find . -name '*.pyc' -print0 | xargs -0 ~/build/pyc-timestamp.sh "$REFERENCE_DATETIME" - ~/build/dzip.sh "$tmpzip" . - cd - - mv -f "$tmpzip" "$ZIPFILE" - rm -rf "$tmpdir" - } - # - # - tar xvf gmp.tar.bz2 - cd gmp-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared - make - make install - cp -an $INSTDIR/gmp/bin/*dll* $INSTDIR/Tor - cd .. - # - # - # Install a Wine new enough to have a fix for http://bugs.winehq.org/show_bug.cgi?id=29764; - # otherwise Python run under Wine constantly crashes in _PyVerify_fd, which is - # called by such common operations as io.open and os.fstat (anything involving - # a file descriptor number). Ubuntu's main repository only has wine1.4, and - # the issue was fixed in 1.5.29. sudo -s sh -c "echo deb http://$MIRROR_HOST:3142/ppa.launchpad.net/ubuntu-wine/ppa/ubuntu precise main >> /etc/apt/sources.list" # This key is from https://launchpad.net/~ubuntu-wine/+archive/ppa and # http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x5A9A06AEF9CB8D…. @@ -140,40 +126,40 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py py2exe cp -a dist/gcc.exe dist/g++.exe dist/dllwrap.exe dist/swig.exe $WINEROOT/windows/ cd .. - # + + # Building setuptools tar xzf setuptools.tar.gz cd setuptools-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # + + # Bulding pyptlib cd pyptlib find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. - # + + # Building PyCrypto tar xzf pycrypto.tar.gz cd pycrypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - # This is bogus, that we run the configure script in the build environment, but it seems to work. - # https://bugs.launchpad.net/pycrypto/+bug/1096207 for ac_cv_func_malloc_0_nonnull. + # This is bogus, that we run the configure script in the build environment, + # but it seems to work. https://bugs.launchpad.net/pycrypto/+bug/1096207 for + # ac_cv_func_malloc_0_nonnull. ac_cv_func_malloc_0_nonnull=yes sh configure --host=i686-w64-mingw32 LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # + + # Building argparse tar xzf argparse.tar.gz cd argparse-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # - tar xzf pyyaml.tar.gz - cd PyYAML-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - LD_PRELOAD= $INSTPYTHON setup.py install - cd .. - # + + # Building Zope interfaces unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME" @@ -182,11 +168,20 @@ script: | # Must create this file in order for py2exe to find the package. touch $INSTDIR/python/Lib/site-packages/zope/__init__.py cd .. - # + + # Building PyYAML + tar xzf pyyaml.tar.gz + cd PyYAML-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + + # Building Twisted tar xjf twisted.tar.bz2 cd Twisted-* find -type f | xargs touch --date="$REFERENCE_DATETIME" - # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" rather than "Python.h". + # twisted/internet/iocpreactor/iocpsupport/iocpsupport.c includes "python.h" + # rather than "Python.h". ln -sf Python.h $INSTDIR/python/include/python.h # We need to set the "mingw32" compiler to avoid an error in build_ext, but # Twisted's "install" command calls build_ext unconditionally, whether the @@ -196,13 +191,18 @@ script: | echo $'[build_ext]\ncompiler=mingw32' > setup.cfg LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. - # + # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py + # file. + find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" + + # Building Parsley tar xzf parsley.tar.gz cd Parsley-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # + + # Building txsocksx cd txsocksx find -type f | xargs touch --date="$REFERENCE_DATETIME" # Let's pretend we have the setup dependency already as we don't want to get @@ -212,10 +212,8 @@ script: | mkdir vcversioner-1.14.1.1-py2.7.egg LD_PRELOAD= $INSTPYTHON setup.py install cd .. - # - # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py file. - find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - # + + # Building obfsproxy cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_py2exe.py py2exe @@ -225,24 +223,19 @@ script: | mkdir -p $INSTDIR/Docs/Obfsproxy cp {LICENSE,README} $INSTDIR/Docs/Obfsproxy cd .. - # - tar xzf openssl.tar.gz - cd openssl-* - find -type f | xargs touch --date="$REFERENCE_DATETIME" - ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl - make - make install - cd .. - # + + # Building M2Crypto tar xzf m2crypto.tar.gz cd M2Crypto-* find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup.py build_ext -c mingw32 --openssl $INSTDIR/openssl/ -lssl.dll,crypto.dll LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. - # + # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py + # file. find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" - # + + # Building flashproxy cd flashproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" make dist-exe DISTNAME=flashproxy-client PYTHON="LD_PRELOAD= $INSTPYTHON" @@ -251,7 +244,8 @@ script: | mkdir -p $INSTDIR/Docs/FlashProxy cp dist/flashproxy-client-win32/{doc/*,README,LICENSE,ChangeLog} $INSTDIR/Docs/FlashProxy cd .. - # + + # Building libfte cd libfte ln -s $INSTDIR/gmp thirdparty/gmp cp -a $INSTDIR/gmp/bin/libgmp-*.dll . @@ -262,7 +256,8 @@ script: | cp -an {LICENSE,README.md} $INSTDIR/Docs/libfte cp -an thirdparty/re2/LICENSE $INSTDIR/Docs/libfte/LICENSE.re2 cd .. - # + + # Building fteproxy cd fteproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" LD_PRELOAD= $INSTPYTHON setup_tbb.py py2exe @@ -275,10 +270,11 @@ script: | mkdir -p $INSTDIR/Docs/fteproxy cp -an {COPYING,README.md} $INSTDIR/Docs/fteproxy cd .. - # + # http://bugs.winehq.org/show_bug.cgi?id=3591 cp -a $INSTDIR/python/python27.dll $PTDIR/ - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh pluggable-transports-win32-gbuilt.zip Tor/ Docs/ cp pluggable-transports-win32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index abfd8bb..19c4acd 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -43,7 +43,7 @@ script: | export TZ=UTC export LC_ALL=C umask 0022 - # + mkdir -p $INSTDIR/bin/ mkdir -p $INSTDIR/Tor/ mkdir -p $INSTDIR/Data/Tor/ @@ -58,7 +58,8 @@ script: | # See the we-need-only-the-binutils-comment in gitian-utils.yml for the # reasoning behind the "mingw-w64" dir instead of an expected "binutils" one. export PATH=$INSTDIR/mingw-w64/bin:$PATH - # + + # Building tor cd tor git update-index --refresh -q export GIT_COMMITTER_NAME="nobody" @@ -98,7 +99,8 @@ script: | # XXX: Geoip files.. cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/Tor/ cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/Tor/ - # + + # Grabbing the result cd $INSTDIR ~/build/dzip.sh tor-win32-gbuilt.zip Tor/ Data/ cp tor-win32-gbuilt.zip $OUTDIR/ diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 4e321a0..530e716 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -30,6 +30,7 @@ files: - "binutils.tar.bz2" - "gcc.tar.bz2" - "openssl.tar.gz" +- "gmp.tar.bz2" - "versions" - "dzip.sh" script: | @@ -135,11 +136,20 @@ script: | make install cd .. + # Building GMP + tar xjf gmp.tar.bz2 + cd gmp-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + ./configure --prefix=$INSTDIR/gmp --host=i686-w64-mingw32 --enable-cxx --disable-static --enable-shared + make + make install + cd .. + # Grabbing the remaining results cd $INSTDIR ~/build/dzip.sh mingw-w64-$GCC_VER-win32-utils.zip mingw-w64 ~/build/dzip.sh zlib-${ZLIB_TAG#v}-win32-utils.zip zlib ~/build/dzip.sh libevent-${LIBEVENT_TAG#release-}-win32-utils.zip libevent ~/build/dzip.sh openssl-$OPENSSL_VER-win32-utils.zip openssl - + ~/build/dzip.sh gmp-$GMP_VER-win32-utils.zip gmp cp *-utils.zip $OUTDIR/ diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 992a23a..330e475 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -105,7 +105,9 @@ if [ ! -f inputs/openssl-$OPENSSL_VER-linux32-utils.zip -o \ ! -f inputs/python-$PYTHON_VER-linux32-utils.zip -o \ ! -f inputs/python-$PYTHON_VER-linux64-utils.zip -o \ ! -f inputs/lxml-$LXML_VER-linux32-utils.zip -o \ - ! -f inputs/lxml-$LXML_VER-linux64-utils.zip ]; + ! -f inputs/lxml-$LXML_VER-linux64-utils.zip -o \ + ! -f inputs/gmp-$GMP_VER-linux32-utils.zip -o \ + ! -f inputs/gmp-$GMP_VER-linux64-utils.zip ]; then echo echo "****** Starting Utilities Component of Linux Bundle (1/5 for Linux) ******" @@ -128,6 +130,8 @@ then ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip + ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip + ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. #cp -a result/utils-linux-res.yml inputs/ else @@ -145,6 +149,8 @@ else ln -sf python-$PYTHON_VER-linux64-utils.zip python-linux64-utils.zip ln -sf lxml-$LXML_VER-linux32-utils.zip lxml-linux32-utils.zip ln -sf lxml-$LXML_VER-linux64-utils.zip lxml-linux64-utils.zip + ln -sf gmp-$GMP_VER-linux32-utils.zip gmp-linux32-utils.zip + ln -sf gmp-$GMP_VER-linux64-utils.zip gmp-linux64-utils.zip cd .. fi diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index fb1d32f..e852989 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -106,7 +106,8 @@ fi cd $GITIAN_DIR if [ ! -f inputs/openssl-$OPENSSL_VER-mac32-utils.zip -o \ - ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip ]; + ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip -o \ + ! -f inputs/gmp-$GMP_VER-mac32-utils.zip ]; then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Max) ******" @@ -122,6 +123,7 @@ then cp -a ../build/out/*-utils.zip . ln -sf openssl-$OPENSSL_VER-mac32-utils.zip openssl-mac32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip libevent-mac32-utils.zip + ln -sf gmp-$GMP_VER-mac32-utils.zip gmp-mac32-utils.zip cd .. #cp -a result/utils-mac-res.yml inputs/ else @@ -134,6 +136,7 @@ else cd inputs ln -sf openssl-$OPENSSL_VER-mac32-utils.zip openssl-mac32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-mac32-utils.zip libevent-mac32-utils.zip + ln -sf gmp-$GMP_VER-mac32-utils.zip gmp-mac32-utils.zip cd .. fi diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 198fe87..ecabeae 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -104,7 +104,8 @@ if [ ! -f inputs/binutils-$BINUTILS_VER-win32-utils.zip -o \ ! -f inputs/mingw-w64-$GCC_VER-win32-utils.zip -o \ ! -f inputs/zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip -o \ ! -f inputs/libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip -o \ - ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip ]; + ! -f inputs/openssl-$OPENSSL_VER-win32-utils.zip -o \ + ! -f inputs/gmp-$GMP_VER-win32-utils.zip ]; then echo echo "****** Starting Utilities Component of Windows Bundle (1/5 for Windows) ******" @@ -124,6 +125,7 @@ then ln -sf zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip zlib-win32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip libevent-win32-utils.zip ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip + ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip cd .. #cp -a result/utils-win-res.yml inputs/ else @@ -138,6 +140,7 @@ else ln -sf zlib-${ZLIB_TAG_ORIG#v}-win32-utils.zip zlib-win32-utils.zip ln -sf libevent-${LIBEVENT_TAG_ORIG#release-}-win32-utils.zip libevent-win32-utils.zip ln -sf openssl-$OPENSSL_VER-win32-utils.zip openssl-win32-utils.zip + ln -sf gmp-$GMP_VER-win32-utils.zip gmp-win32-utils.zip cd .. fi

1 0