October 2013 - tor-commits - lists.torproject.org

[tor/release-0.2.4] Increase POLICY_BUF_LEN to 72 to accomodate IPv6 exit policy items.
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit a5f6cb908c32dcf8c7efbde2702b70ccd36e82f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 11:30:09 2013 -0400 Increase POLICY_BUF_LEN to 72 to accomodate IPv6 exit policy items. Fixes bug 9596; bugfix on 0.2.4.7-alpha. --- changes/bug9596 | 4 ++++ src/or/policies.h | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changes/bug9596 b/changes/bug9596 new file mode 100644 index 0000000..b3d138e --- /dev/null +++ b/changes/bug9596 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Correctly log long IPv6 exit policy, instead of truncating them + or reporting an error. Fixes bug 9596; bugfix on 0.2.4.7-alpha. + diff --git a/src/or/policies.h b/src/or/policies.h index c0e7a9e..facbbb6 100644 --- a/src/or/policies.h +++ b/src/or/policies.h @@ -12,10 +12,11 @@ #ifndef TOR_POLICIES_H #define TOR_POLICIES_H -/* (length of "accept 255.255.255.255/255.255.255.255:65535-65535\n" plus a - * NUL.) +/* (length of + * "accept6 [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]/128:65535-65535\n" + * plus a terminating NUL, rounded up to a nice number.) */ -#define POLICY_BUF_LEN 52 +#define POLICY_BUF_LEN 72 int firewall_is_fascist_or(void); int fascist_firewall_allows_address_or(const tor_addr_t *addr, uint16_t port);

1 0

[tor-browser-bundle/master] Add new key for Torbutton and Tor-Launcher signatures.
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit 11ebcec0f6f495004ea616843dc26b8725aeff24 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 18:31:54 2013 -0700 Add new key for Torbutton and Tor-Launcher signatures. --- gitian/gpg/torbutton.gpg | Bin 1814 -> 7813 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/torbutton.gpg b/gitian/gpg/torbutton.gpg index 6c22b18..ab4acc0 100644 Binary files a/gitian/gpg/torbutton.gpg and b/gitian/gpg/torbutton.gpg differ

1 0

[tor/master] Merge branch 'maint-0.2.4'
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit 78251e004f03eca93dfbdae2a2b6c18bff948bf2 Merge: 43f95e3 eb5d75e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 21:25:01 2013 -0400 Merge branch 'maint-0.2.4' ChangeLog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

1 0

[tor/master] rewrite history to improve two changelog entries
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit eb5d75e96afed76b968cb87365ba6e54cac35b2e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 21:17:19 2013 -0400 rewrite history to improve two changelog entries --- ChangeLog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd7f691..e08f3c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,8 +308,7 @@ Changes in version 0.2.4.7-alpha - 2012-12-24 network connection drastically changes. Should help with bug 3443. o Major features (IPv6): - - Tor now has (alpha) support for exiting to IPv6 addresses. To - enable it as an exit node, make sure that you have IPv6 + - Relays can now exit to IPv6 addresses: make sure that you have IPv6 connectivity, then set the IPv6Exit flag to 1. Also make sure your exit policy reads as you would like: the address * applies to all address families, whereas *4 is IPv4 address only, and *6 is IPv6 @@ -779,7 +778,7 @@ Changes in version 0.2.4.3-alpha - 2012-09-22 than it ran through the part of the loop before it had made its choice. Addresses ticket 6538. - Disable the use of Guard nodes when in Tor2WebMode. Guard usage - by tor2web clients allows hidden services to identity tor2web + by tor2web clients allows hidden services to identify tor2web clients through their repeated selection of the same rendezvous and introduction point circuit endpoints (their guards). Resolves ticket 6888.

1 0

[tor-browser-bundle/master] Bug 9114: Reorganize bundle directory structure for TBB 3.0.
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit 23688accb6e34c3c2af14f0cc684ace80d092ff7 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 25 10:44:22 2013 -0400 Bug 9114: Reorganize bundle directory structure for TBB 3.0. --- .../Data/Browser/profile.default/bookmarks.html | 17 ++++++ .../preferences/extension-overrides.js | 57 ++++++++++++++++++++ Bundle-Data/linux/Data/Browser/profiles.ini | 9 ++++ Bundle-Data/linux/Data/Tor/torrc | 15 ------ Bundle-Data/linux/Data/Tor/torrc-defaults | 11 ++++ Bundle-Data/linux/Data/profile/bookmarks.html | 17 ------ .../profile/preferences/extension-overrides.js | 57 -------------------- Bundle-Data/linux/Data/profiles.ini | 8 --- Bundle-Data/mac/Contents/Info.plist | 2 +- Bundle-Data/mac/Contents/Resources/firefox.icns | Bin 0 -> 242224 bytes Bundle-Data/mac/Contents/Resources/vidalia.icns | Bin 42887 -> 0 bytes .../Data/Browser/profile.default/bookmarks.html | 17 ++++++ .../preferences/extension-overrides.js | 57 ++++++++++++++++++++ Bundle-Data/mac/Data/Browser/profiles.ini | 9 ++++ Bundle-Data/mac/Data/Tor/torrc-defaults | 11 ++++ .../profile/preferences/extension-overrides.js | 57 -------------------- Bundle-Data/mac/Library/Vidalia/torrc | 15 ------ .../Data/Browser/profile.default/bookmarks.html | 17 ++++++ .../preferences/extension-overrides.js | 57 ++++++++++++++++++++ Bundle-Data/windows/Data/Browser/profiles.ini | 9 ++++ Bundle-Data/windows/Data/Tor/torrc | 15 ------ Bundle-Data/windows/Data/Tor/torrc-defaults | 11 ++++ .../FirefoxPortable/Data/profile/bookmarks.html | 17 ------ .../profile/preferences/extension-overrides.js | 57 -------------------- .../windows/FirefoxPortable/Data/profiles.ini | 8 --- RelativeLink/RelativeLink.c | 2 +- RelativeLink/RelativeLink.sh | 14 ++--- RelativeLink/RelativeLinkOSX.sh | 6 +-- gitian/descriptors/linux/gitian-bundle.yml | 31 +++++------ gitian/descriptors/linux/gitian-firefox.yml | 28 +++++----- gitian/descriptors/linux/gitian-tor.yml | 42 +++++++-------- gitian/descriptors/mac/gitian-bundle.yml | 20 +++---- gitian/descriptors/mac/gitian-tor.yml | 20 +++---- gitian/descriptors/windows/gitian-bundle.yml | 30 +++++------ gitian/descriptors/windows/gitian-firefox.yml | 31 ++++++----- gitian/descriptors/windows/gitian-tor.yml | 16 +++--- 36 files changed, 402 insertions(+), 388 deletions(-) diff --git a/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html b/Bundle-Data/linux/Data/Browser/profile.default/bookmarks.html new file mode 100644 index 0000000..7aa31dd --- /dev/null +++ b/Bundle-Data/linux/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/linux/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js new file mode 100644 index 0000000..dff61f5 --- /dev/null +++ b/Bundle-Data/linux/Data/Browser/profile.default/preferences/extension-overrides.js @@ -0,0 +1,57 @@ +# 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); + +# NoScript Preferences: +pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore 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:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +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/linux/Data/Browser/profiles.ini b/Bundle-Data/linux/Data/Browser/profiles.ini new file mode 100644 index 0000000..726d784 --- /dev/null +++ b/Bundle-Data/linux/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/linux/Data/Tor/torrc b/Bundle-Data/linux/Data/Tor/torrc index 4eb54fa..e69de29 100644 --- a/Bundle-Data/linux/Data/Tor/torrc +++ b/Bundle-Data/linux/Data/Tor/torrc @@ -1,15 +0,0 @@ -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 -# Store working data, state, keys, and caches here. -DataDirectory ./Data/Tor -GeoIPFile ./Data/Tor/geoip -# 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. -SocksListenAddress 127.0.0.1 -SocksPort 9150 -ControlPort 9151 - -CookieAuthentication 1 diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults new file mode 100644 index 0000000..0c46e9f --- /dev/null +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -0,0 +1,11 @@ +# 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. +SocksListenAddress 127.0.0.1 +SocksPort 9150 +ControlPort 9151 +CookieAuthentication 1 diff --git a/Bundle-Data/linux/Data/profile/bookmarks.html b/Bundle-Data/linux/Data/profile/bookmarks.html deleted file mode 100644 index 7aa31dd..0000000 --- a/Bundle-Data/linux/Data/profile/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/linux/Data/profile/preferences/extension-overrides.js b/Bundle-Data/linux/Data/profile/preferences/extension-overrides.js deleted file mode 100644 index dff61f5..0000000 --- a/Bundle-Data/linux/Data/profile/preferences/extension-overrides.js +++ /dev/null @@ -1,57 +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); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore 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:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); -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/linux/Data/profiles.ini b/Bundle-Data/linux/Data/profiles.ini deleted file mode 100644 index 0e5e6ab..0000000 --- a/Bundle-Data/linux/Data/profiles.ini +++ /dev/null @@ -1,8 +0,0 @@ -[General] -StartWithLastProfile=1 - -[Profile0] -Name=default -IsRelative=1 -Path=firefox.default - diff --git a/Bundle-Data/mac/Contents/Info.plist b/Bundle-Data/mac/Contents/Info.plist index 638a1f2..7b0c2ca 100644 --- a/Bundle-Data/mac/Contents/Info.plist +++ b/Bundle-Data/mac/Contents/Info.plist @@ -11,7 +11,7 @@ <key>CFBundleGetInfoString</key> <string>Tor Browser Bundle 1.0 Copyright 2010 The Tor Project</string> <key>CFBundleIconFile</key> - <string>vidalia.icns</string> + <string>firefox.icns</string> <key>CFBundleIdentifier</key> <string>org.torproject.TorBrowserBundle</string> <key>CFBundleInfoDictionaryVersion</key> diff --git a/Bundle-Data/mac/Contents/Resources/firefox.icns b/Bundle-Data/mac/Contents/Resources/firefox.icns new file mode 100644 index 0000000..481914f Binary files /dev/null and b/Bundle-Data/mac/Contents/Resources/firefox.icns differ diff --git a/Bundle-Data/mac/Contents/Resources/vidalia.icns b/Bundle-Data/mac/Contents/Resources/vidalia.icns deleted file mode 100644 index beb6c48..0000000 Binary files a/Bundle-Data/mac/Contents/Resources/vidalia.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 new file mode 100644 index 0000000..7aa31dd --- /dev/null +++ b/Bundle-Data/mac/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/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js new file mode 100644 index 0000000..dff61f5 --- /dev/null +++ b/Bundle-Data/mac/Data/Browser/profile.default/preferences/extension-overrides.js @@ -0,0 +1,57 @@ +# 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); + +# NoScript Preferences: +pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore 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:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +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 new file mode 100644 index 0000000..726d784 --- /dev/null +++ b/Bundle-Data/mac/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/Data/Tor/torrc b/Bundle-Data/mac/Data/Tor/torrc new file mode 100644 index 0000000..e69de29 diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults new file mode 100644 index 0000000..0c46e9f --- /dev/null +++ b/Bundle-Data/mac/Data/Tor/torrc-defaults @@ -0,0 +1,11 @@ +# 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. +SocksListenAddress 127.0.0.1 +SocksPort 9150 +ControlPort 9151 +CookieAuthentication 1 diff --git a/Bundle-Data/mac/Library/Application Support/Firefox/Profiles/profile/preferences/extension-overrides.js b/Bundle-Data/mac/Library/Application Support/Firefox/Profiles/profile/preferences/extension-overrides.js deleted file mode 100644 index dff61f5..0000000 --- a/Bundle-Data/mac/Library/Application Support/Firefox/Profiles/profile/preferences/extension-overrides.js +++ /dev/null @@ -1,57 +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); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore 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:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); -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/Library/Vidalia/torrc b/Bundle-Data/mac/Library/Vidalia/torrc deleted file mode 100644 index a30e37a..0000000 --- a/Bundle-Data/mac/Library/Vidalia/torrc +++ /dev/null @@ -1,15 +0,0 @@ -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 -# Store working data, state, keys, and caches here. -DataDirectory ../../Contents/Resources/Data/Tor -GeoIPFile ../../Contents/Resources/Data/Tor/geoip -# 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. -SocksListenAddress 127.0.0.1 -SocksPort 9150 -ControlPort 9151 - -CookieAuthentication 1 diff --git a/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html b/Bundle-Data/windows/Data/Browser/profile.default/bookmarks.html new file mode 100644 index 0000000..7aa31dd --- /dev/null +++ b/Bundle-Data/windows/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/windows/Data/Browser/profile.default/preferences/extension-overrides.js b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js new file mode 100644 index 0000000..dff61f5 --- /dev/null +++ b/Bundle-Data/windows/Data/Browser/profile.default/preferences/extension-overrides.js @@ -0,0 +1,57 @@ +# 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); + +# NoScript Preferences: +pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); +pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore 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:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); +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/windows/Data/Browser/profiles.ini b/Bundle-Data/windows/Data/Browser/profiles.ini new file mode 100644 index 0000000..726d784 --- /dev/null +++ b/Bundle-Data/windows/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/windows/Data/Tor/torrc b/Bundle-Data/windows/Data/Tor/torrc index 692f2a0..e69de29 100644 --- a/Bundle-Data/windows/Data/Tor/torrc +++ b/Bundle-Data/windows/Data/Tor/torrc @@ -1,15 +0,0 @@ -# If non-zero, try to write to disk less frequently than we would otherwise. -AvoidDiskWrites 1 -# Store working data, state, keys, and caches here. -DataDirectory .\Data\Tor -GeoIPFile .\Data\Tor\geoip -# 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. -SocksListenAddress 127.0.0.1 -SocksPort 9150 -ControlPort 9151 - -CookieAuthentication 1 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults new file mode 100644 index 0000000..0c46e9f --- /dev/null +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -0,0 +1,11 @@ +# 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. +SocksListenAddress 127.0.0.1 +SocksPort 9150 +ControlPort 9151 +CookieAuthentication 1 diff --git a/Bundle-Data/windows/FirefoxPortable/Data/profile/bookmarks.html b/Bundle-Data/windows/FirefoxPortable/Data/profile/bookmarks.html deleted file mode 100644 index 7aa31dd..0000000 --- a/Bundle-Data/windows/FirefoxPortable/Data/profile/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/windows/FirefoxPortable/Data/profile/preferences/extension-overrides.js b/Bundle-Data/windows/FirefoxPortable/Data/profile/preferences/extension-overrides.js deleted file mode 100644 index dff61f5..0000000 --- a/Bundle-Data/windows/FirefoxPortable/Data/profile/preferences/extension-overrides.js +++ /dev/null @@ -1,57 +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); - -# NoScript Preferences: -pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); -pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore 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:blank about:credits addons.mozilla.org flashgot.net google.com gstatic.com googlesyndication.com informaction.com yahoo.com yimg.com maone.net noscript.net hotmail.com msn.com passport.com passport.net passportimages.com live.com"); -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/windows/FirefoxPortable/Data/profiles.ini b/Bundle-Data/windows/FirefoxPortable/Data/profiles.ini deleted file mode 100644 index 0e5e6ab..0000000 --- a/Bundle-Data/windows/FirefoxPortable/Data/profiles.ini +++ /dev/null @@ -1,8 +0,0 @@ -[General] -StartWithLastProfile=1 - -[Profile0] -Name=default -IsRelative=1 -Path=firefox.default - diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c index ccc48ae..bae4647 100755 --- a/RelativeLink/RelativeLink.c +++ b/RelativeLink/RelativeLink.c @@ -32,7 +32,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine ZeroMemory ( &pi, sizeof(pi) ); TCHAR *ProgramToStart; - ProgramToStart = TEXT ("FirefoxPortable\\App\\Firefox\\firefox.exe -no-remote -profile .\\FirefoxPortable\\Data\\profile\\"); + ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\"); if( !CreateProcess( NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 8d8c732..a1d8688 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -117,7 +117,7 @@ if [ "`id -u`" -eq 0 ]; then fi SYSARCHITECTURE=$(getconf LONG_BIT) -TORARCHITECTURE=$(expr "$(file App/tor)" : '.*ELF $[[:digit:]]*$') +TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF $[[:digit:]]*$') if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then complain "Wrong architecture? 32-bit vs. 64-bit." @@ -135,7 +135,7 @@ elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then fi # If the user hasn't requested 'debug mode', close whichever of stdout -# and stderr are not ttys, to keep Vidalia and the stuff loaded by/for +# 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 $HOME/.xsession-errors . (Users wouldn't have seen # messages there anyway.) @@ -206,13 +206,13 @@ else export HOME fi -if ldd ./App/Firefox/firefox-bin | grep -q "libz\.so\.1.*not found"; then - LD_LIBRARY_PATH="${HOME}/Lib:${HOME}/Lib/libz" +if ldd ./Browser/firefox-bin | grep -q "libz\.so\.1.*not found"; then + LD_LIBRARY_PATH="${HOME}/Tor:${HOME}/Tor/libz" else - LD_LIBRARY_PATH="${HOME}/Lib" + LD_LIBRARY_PATH="${HOME}/Tor" fi -LDPATH="${HOME}/Lib/" +LDPATH="${HOME}/Tor/" export LDPATH export LD_LIBRARY_PATH @@ -223,7 +223,7 @@ printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" # XXX Someday we should pass whatever command-line arguments we got # (probably filenames or URLs) to Firefox. -./App/Firefox/firefox -no-remote -profile Data/profile +./Browser/firefox -no-remote -profile 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 index 6d01179..29832d1 100755 --- a/RelativeLink/RelativeLinkOSX.sh +++ b/RelativeLink/RelativeLinkOSX.sh @@ -20,7 +20,7 @@ if [ "x$1" = "x--debug" -o "x$1" = "x-debug" ]; then fi # If the user hasn't requested 'debug mode', close whichever of stdout -# and stderr are not ttys, to keep Vidalia and the stuff loaded by/for +# 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.) @@ -53,7 +53,7 @@ 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-bin -jsconsole -no-remote -profile "${HOME}/Library/Application Support/Firefox/Profiles/profile" + ./Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox-bin -jsconsole -no-remote -profile "${HOME}/Data/Browser/profile.default" printf "\nTor Browser exited with the following return code: $?\n" exit fi @@ -61,4 +61,4 @@ fi # not in debug mode, run proceed normally printf "\nLaunching Tor Browser Bundle for OS X in ${HOME}\n" cd "${HOME}" -"${HOME}/Contents/MacOS/TorBrowser.app/Contents/MacOS/firefox-bin" --args -no-remote -profile "${HOME}/Library/Application Support/Firefox/Profiles/profile" +open "${HOME}/Contents/MacOS/TorBrowser.app" --args -no-remote -profile "${HOME}/Data/Browser/profile.default" diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index bb030f6..115eb6f 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -49,10 +49,10 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tor-browser/Data/profile/extensions/https-everywhere(a)eff.org - mkdir -p tor-browser/sources/ + mkdir -p tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tor-browser/Docs/sources/ # - cp *.xpi tor-browser/Data/profile/extensions/ + cp *.xpi tor-browser/Data/Browser/profile.default/extensions/ # cd tor-launcher make clean @@ -61,7 +61,7 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../tor-browser/Data/profile/extensions/tor-launcher(a)torproject.org.xpi . + ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi . cd ../../../ # cd torbutton @@ -71,16 +71,16 @@ script: | mkdir pkg/tmp cd pkg/tmp unzip ../*.xpi - ~/build/dzip.sh ../../../tor-browser/Data/profile/extensions/torbutton(a)torproject.org.xpi . + ~/build/dzip.sh ../../../tor-browser/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi . cd ../../../ # cd https-everywhere ./makexpi.sh - cp ./pkg/*.xpi ../tor-browser/Data/profile/extensions/https-everywhere(a)eff.org.xpi + cp ./pkg/*.xpi ../tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - mv tor-browser/Data/profile/extensions/noscript(a)noscript.net.xpi tor-browser/Data/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi - cd tor-browser/Data/profile/extensions/https-everywhere(a)eff.org/ + mv tor-browser/Data/Browser/profile.default/extensions/noscript(a)noscript.net.xpi tor-browser/Data/Browser/profile.default/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi + cd tor-browser/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org/ unzip ../https-everywhere(a)eff.org.xpi rm ../https-everywhere(a)eff.org.xpi cd ~/build/ @@ -95,20 +95,21 @@ script: | unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip + chmod 700 Data/Browser chmod 700 Data/Tor cd .. # # Copy reproducibility info - cp versions tor-browser/sources/ - cp bundle.inputs tor-browser/sources/bundle.inputs + cp versions tor-browser/Docs/sources/ + cp bundle.inputs tor-browser/Docs/sources/bundle.inputs # cp -a tor-browser tor-browser_en-US - cd tor-browser_en-US/App/Firefox + cd tor-browser_en-US/Browser unzip omni.ja defaults/preferences/000-tor-browser.js echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xd omni.ja defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../ + cd ../../ #7z a -sfx tor-browser.exe tor-browser_en-US #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_en-US.7z-selfextract ~/build/dtar.sh $OUTDIR/tor-browser-linux${GBUILD_BITS}-${TORBROWSER_VERSION}_en-US.tar.xz tor-browser_en-US @@ -120,15 +121,15 @@ script: | do LANG=`basename $i .xpi` cp -a ../tor-browser ../tor-browser_$LANG - cp $i ../tor-browser_$LANG/Data/profile/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $i ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - cd tor-browser_$LANG/App/Firefox + cd tor-browser_$LANG/Browser unzip omni.ja defaults/preferences/000-tor-browser.js echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xd omni.ja defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../ + cd ../../ #7z a -sfx tor-browser.exe tor-browser_$LANG #mv tor-browser.exe $OUTDIR/tor-browser-linux${GBUILD_BITS}_$LANG.7z-selfextract diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 013e972..41684ee 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -53,8 +53,8 @@ script: | ln -s /usr/bin/yasm-1 $INSTDIR/build/bin/yasm export PATH=$PATH:$INSTDIR/build/bin # - mkdir -p $INSTDIR/App/Firefox/ - mkdir -p $INSTDIR/Debug/App/Firefox/ + mkdir -p $INSTDIR/Browser/ + mkdir -p $INSTDIR/Debug/Browser/ # cd tor-browser grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed @@ -71,27 +71,27 @@ script: | # make $MAKEOPTS -f client.mk build make -C obj-* package INNER_MAKE_PACKAGE=true - cp -a obj-*/dist/firefox/* $INSTDIR/App/Firefox/ + cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ # TODO: There goes FIPS-140.. We could upload these somewhere unique and # subsequent builds could test to see if they've been uploaded before... # But let's find out if it actually matters first.. - rm -f $INSTDIR/App/Firefox/*.chk + rm -f $INSTDIR/Browser/*.chk # cd $INSTDIR # Strip and generate debuginfo for libs - objcopy --only-keep-debug $INSTDIR/App/Firefox/firefox $INSTDIR/Debug/App/Firefox/firefox - strip $INSTDIR/App/Firefox/firefox - objcopy --add-gnu-debuglink=./Debug/App/Firefox/firefox $INSTDIR/App/Firefox/firefox - for i in $INSTDIR/App/Firefox/*.so + objcopy --only-keep-debug $INSTDIR/Browser/firefox $INSTDIR/Debug/Browser/firefox + strip $INSTDIR/Browser/firefox + objcopy --add-gnu-debuglink=./Debug/Browser/firefox $INSTDIR/Browser/firefox + for i in $INSTDIR/Browser/*.so do LIB=`basename $i` - objcopy --only-keep-debug $INSTDIR/App/Firefox/$LIB $INSTDIR/Debug/App/Firefox/$LIB - strip $INSTDIR/App/Firefox/$LIB - objcopy --add-gnu-debuglink=./Debug/App/Firefox/$LIB $INSTDIR/App/Firefox/$LIB + objcopy --only-keep-debug $INSTDIR/Browser/$LIB $INSTDIR/Debug/Browser/$LIB + strip $INSTDIR/Browser/$LIB + objcopy --add-gnu-debuglink=./Debug/Browser/$LIB $INSTDIR/Browser/$LIB done - ~/build/re-dzip.sh App/Firefox/omni.ja - ~/build/re-dzip.sh App/Firefox/webapprt/omni.ja - ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip App/ + ~/build/re-dzip.sh Browser/omni.ja + ~/build/re-dzip.sh Browser/webapprt/omni.ja + ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-gbuilt.zip Browser/ ~/build/dzip.sh tor-browser-linux$GBUILD_BITS-debug.zip Debug/ cp tor-browser-linux$GBUILD_BITS-gbuilt.zip $OUTDIR/ cp tor-browser-linux$GBUILD_BITS-debug.zip $OUTDIR/ diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index f431222..dd17184 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -42,18 +42,16 @@ script: | export DEB_BUILD_HARDENING_FORMAT=1 export DEB_BUILD_HARDENING_PIE=1 # - mkdir -p $INSTDIR/App - mkdir -p $INSTDIR/Debug/Lib/libz - mkdir -p $INSTDIR/Debug/App mkdir -p $INSTDIR/Data/Tor/ - mkdir -p $INSTDIR/Lib/libz/ + mkdir -p $INSTDIR/Tor/libz/ + mkdir -p $INSTDIR/Debug/Tor/libz/ # cd zlib find -type f | xargs touch --date="$REFERENCE_DATETIME" ./configure --prefix=$INSTDIR/zlib make $MAKEOPTS SHARED_MODE=1 make $MAKEOPTS SHARED_MODE=1 install - cp $INSTDIR/zlib/lib/libz.so.1 $INSTDIR/Lib/libz/ + cp $INSTDIR/zlib/lib/libz.so.1 $INSTDIR/Tor/libz/ cd .. # cd libevent @@ -62,7 +60,7 @@ script: | ./configure --disable-static --prefix=$INSTDIR/libevent make $MAKEOPTS make install - cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Lib/ + cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ cd .. # tar xzf openssl.tar.gz @@ -72,12 +70,12 @@ script: | ./config -shared --prefix=$INSTDIR/openssl make make install - cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Lib/ - cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Lib/ + cp $INSTDIR/openssl/lib/libssl.so.1.0.0 $INSTDIR/Tor/ + cp $INSTDIR/openssl/lib/libcrypto.so.1.0.0 $INSTDIR/Tor/ cd .. # - chmod 700 $INSTDIR/Lib/*so* - chmod 700 $INSTDIR/Lib/libz/*so* + chmod 700 $INSTDIR/Tor/*so* + chmod 700 $INSTDIR/Tor/libz/*so* # cd tor mkdir -p $OUTDIR/src @@ -90,25 +88,25 @@ script: | cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ # Strip and generate debuginfo for libs cd $INSTDIR - objcopy --only-keep-debug $INSTDIR/bin/tor $INSTDIR/Debug/App/tor - install -s $INSTDIR/bin/tor $INSTDIR/App/ - objcopy --add-gnu-debuglink=./Debug/App/tor $INSTDIR/App/tor - for i in $INSTDIR/Lib/*so* + objcopy --only-keep-debug $INSTDIR/bin/tor $INSTDIR/Debug/Tor/tor + install -s $INSTDIR/bin/tor $INSTDIR/Tor/ + objcopy --add-gnu-debuglink=./Debug/Tor/tor $INSTDIR/Tor/tor + for i in $INSTDIR/Tor/*so* do LIB=`basename $i` - objcopy --only-keep-debug $INSTDIR/Lib/$LIB $INSTDIR/Debug/Lib/$LIB - strip $INSTDIR/Lib/$LIB - objcopy --add-gnu-debuglink=./Debug/Lib/$LIB $INSTDIR/Lib/$LIB + objcopy --only-keep-debug $INSTDIR/Tor/$LIB $INSTDIR/Debug/Tor/$LIB + strip $INSTDIR/Tor/$LIB + objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $INSTDIR/Tor/$LIB done - for i in $INSTDIR/Lib/libz/*so* + for i in $INSTDIR/Tor/libz/*so* do LIB=`basename $i` - objcopy --only-keep-debug $INSTDIR/Lib/libz/$LIB $INSTDIR/Debug/Lib/libz/$LIB - strip $INSTDIR/Lib/libz/$LIB - objcopy --add-gnu-debuglink=./Debug/Lib/libz/$LIB $INSTDIR/Lib/libz/$LIB + objcopy --only-keep-debug $INSTDIR/Tor/libz/$LIB $INSTDIR/Debug/Tor/libz/$LIB + strip $INSTDIR/Tor/libz/$LIB + objcopy --add-gnu-debuglink=./Debug/Tor/libz/$LIB $INSTDIR/Tor/libz/$LIB done # - ~/build/dzip.sh tor-linux$GBUILD_BITS-gbuilt.zip Data/ App/ Lib/ + ~/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/ cp tor-linux$GBUILD_BITS-debug.zip $OUTDIR/ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index eadd5c6..a4d5835 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -44,9 +44,9 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org + mkdir -p TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org mkdir -p TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ - mkdir -p TorBrowserBundle.app/sources + mkdir -p TorBrowserBundle.app/Docs/sources # cd tor-launcher make clean @@ -57,7 +57,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/tor-launcher(a)torproject.org.xpi + mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi cd ../../../ # cd torbutton @@ -69,16 +69,16 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/torbutton(a)torproject.org.xpi + mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi cd ../../../ # cd https-everywhere ./makexpi.sh - cp ./pkg/*.xpi ../TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/https-everywhere(a)eff.org.xpi + cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - cp *.xpi ./TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/ - cd ./TorBrowserBundle.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/ + cp *.xpi ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/ + cd ./TorBrowserBundle.app/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 @@ -99,8 +99,8 @@ script: | cd ../../../ # # Copy reproducibility info - cp versions TorBrowserBundle.app/sources/ - cp bundle.inputs TorBrowserBundle.app/sources/bundle.inputs + cp versions TorBrowserBundle.app/Docs/sources/ + cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs # cd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ unzip omni.ja defaults/preferences/000-tor-browser.js @@ -119,7 +119,7 @@ script: | do LANG=`basename $i .xpi` cp -a ../TorBrowserBundle.app ../TorBrowserBundle_$LANG.app - cp $i ../TorBrowserBundle_$LANG.app/Library/"Application Support"/Firefox/Profiles/profile/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. cd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/ diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 4d14c71..7707555 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -46,8 +46,8 @@ script: | 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" # mkdir -p $INSTDIR/bin/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ - mkdir -p $INSTDIR/TorBrowserBundle.app/Contents/Resources/Data/Tor/ + mkdir -p $INSTDIR/TorBrowserBundle.app/Tor/ + mkdir -p $INSTDIR/TorBrowserBundle.app/Data/Tor/ mkdir -p $OUTDIR/ # sudo dpkg -i *.deb @@ -61,7 +61,7 @@ script: | #find -type f | xargs touch --date="$REFERENCE_DATETIME" #make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib PREFIX=i686-apple-darwin10- $MAKEOPTS SHARED_MODE=1 #make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib PREFIX=i686-apple-darwin10- $MAKEOPTS SHARED_MODE=1 install - #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/App/ + #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/ #cd .. # tar xzf openssl.tar.gz @@ -70,7 +70,7 @@ script: | ./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/Contents/MacOS/ + #cp $INSTDIR/openssl/lib/*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ cd .. # cd libevent @@ -79,7 +79,7 @@ script: | ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent make $MAKEOPTS make install - cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ + cp $INSTDIR/libevent/lib/libevent-*.dylib $INSTDIR/TorBrowserBundle.app/Tor/ LIBEVENT_FILE=`basename $INSTDIR/libevent/lib/libevent-*.dylib` cd .. # @@ -92,14 +92,14 @@ script: | make $MAKEOPTS make install cd .. - cp $INSTDIR/bin/tor $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ - cp $INSTDIR/share/tor/geoip $INSTDIR/TorBrowserBundle.app/Contents/Resources/Data/Tor/ - cd $INSTDIR/TorBrowserBundle.app/Contents/MacOS/ + cp $INSTDIR/bin/tor $INSTDIR/TorBrowserBundle.app/Tor/ + cp $INSTDIR/share/tor/geoip $INSTDIR/TorBrowserBundle.app/Data/Tor/ + cd $INSTDIR/TorBrowserBundle.app/Tor/ i686-apple-darwin11-install_name_tool -change /home/ubuntu/install/libevent/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor # XXX: Geoip files.. # - #cp -a /usr/lib/gcc/i686-apple-darwin10/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/ - #cp -a /usr/lib/gcc/i686-apple-darwin10/4.6/libssp*.dll $INSTDIR/App/ + #cp -a /usr/lib/gcc/i686-apple-darwin10/4.6/libgcc_s_sjlj-1.dll $INSTDIR/Tor/ + #cp -a /usr/lib/gcc/i686-apple-darwin10/4.6/libssp*.dll $INSTDIR/Tor/ # cd $INSTDIR ~/build/dzip.sh tor-mac$GBUILD_BITS-gbuilt.zip TorBrowserBundle.app diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 97bb9d9..0af203f 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -46,8 +46,8 @@ script: | umask 0022 # mkdir -p $OUTDIR/ - mkdir -p tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org - mkdir -p tbb-windows-installer/"Tor Browser"/sources + mkdir -p tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org + mkdir -p tbb-windows-installer/"Tor Browser"/Docs/sources # cd tor-launcher make clean @@ -58,7 +58,7 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi . - mv ../tor-launcher(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions/tor-launcher(a)torproject.org.xpi + mv ../tor-launcher(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi cd ../../../ # cd torbutton @@ -69,16 +69,16 @@ script: | unzip ../*.xpi rm ../*.xpi ~/build/dzip.sh ../torbutton(a)torproject.org.xpi . - mv ../torbutton(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions/torbutton(a)torproject.org.xpi + mv ../torbutton(a)torproject.org.xpi ../../../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi cd ../../../ # cd https-everywhere ./makexpi.sh - cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions/https-everywhere(a)eff.org.xpi + cp ./pkg/*.xpi ../tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi cd .. # - cp *.xpi ./tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions - cd ./tbb-windows-installer/"Tor Browser"/FirefoxPortable/Data/profile/extensions + cp *.xpi ./tbb-windows-installer/"Tor Browser"/Data/Browser/profile.default/extensions + cd ./tbb-windows-installer/"Tor Browser"/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 @@ -101,15 +101,15 @@ script: | cd .. # # Copy reproducibility info - cp ../versions "Tor Browser"/sources/ - cp ../bundle.inputs "Tor Browser"/sources/bundle.inputs + cp ../versions "Tor Browser"/Docs/sources/ + cp ../bundle.inputs "Tor Browser"/Docs/sources/ # - cd "Tor Browser"/FirefoxPortable/App/Firefox + cd "Tor Browser"/Browser unzip omni.ja defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../../ + cd ../../ makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_en-US.exe # @@ -118,19 +118,19 @@ script: | for i in *.xpi do LANG=`basename $i .xpi` - cp $i ../"Tor Browser"/FirefoxPortable/Data/profile/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd .. - cd "Tor Browser"/FirefoxPortable/App/Firefox + cd "Tor Browser"/Browser mkdir -p defaults/preferences cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js - cd ../../../../ + cd ../../ makensis torbrowser.nsi mv torbrowser-install.exe $OUTDIR/torbrowser-install-${TORBROWSER_VERSION}_$LANG.exe - rm ./"Tor Browser"/FirefoxPortable/Data/profile/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi + rm ./"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi cd win32-langpacks done cd .. diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 698cf35..3085e27 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -33,16 +33,14 @@ files: - "i686-w64-mingw32-ld" - "msvcr100.dll" script: | - INSTDIR="$HOME/install/FirefoxPortable/" + INSTDIR="$HOME/install" export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME export TZ=UTC export LC_ALL=C umask 0022 # - mkdir -p $INSTDIR/Data/profile/preferences - mkdir -p $INSTDIR/Data/profile/extensions - mkdir -p $INSTDIR/App/Firefox/ + mkdir -p $INSTDIR/Browser/ mkdir -p $OUTDIR/ # If we ever find out that the 12.04 mingw is buggy/insufficient: #sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu raring main restricted universe multiverse" >> /etc/apt/sources.list' @@ -162,21 +160,22 @@ script: | make $MAKEOPTS -f client.mk build # make -C obj-* package INNER_MAKE_PACKAGE=true - cp -a obj-*/dist/firefox/* $INSTDIR/App/Firefox/ - cp -a /usr/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll $INSTDIR/App/Firefox/ - cp -a /usr/i686-w64-mingw32/lib/libstdc*dll $INSTDIR/App/Firefox/ - cp -a ~/build/msvcr100.dll $INSTDIR/App/Firefox/ + cp -a obj-*/dist/firefox/* $INSTDIR/Browser/ + cp -a /usr/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll $INSTDIR/Browser/ + cp -a /usr/i686-w64-mingw32/lib/libstdc*dll $INSTDIR/Browser/ + cp -a ~/build/msvcr100.dll $INSTDIR/Browser/ # # XXX: What the hell are these three bytes anyways? - sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/App/Firefox/xul.dll - sed 's/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8...\x04\xba\xcb\x7e/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/App/Firefox/gkmedias.dll + sed 's/\x94\x0C\xE7\x6A\xB8\x0C\xE7\x6A\x08...\x04\xBA\xCB\x7E/\x94\x0c\xe7\x6a\xb8\x0c\xe7\x6a\x08\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/xul.dll + sed 's/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8...\x04\xba\xcb\x7e/\x94\xb1\x24\x65\xb8\xb1\x24\x65\xf8\x23\x23\x23\x04\xba\xcb\x7e/M' -i $INSTDIR/Browser/gkmedias.dll # Stripping again updates the PE header checksums to be correct - i686-w64-mingw32-strip $INSTDIR/App/Firefox/gkmedias.dll - i686-w64-mingw32-strip $INSTDIR/App/Firefox/xul.dll + i686-w64-mingw32-strip $INSTDIR/Browser/gkmedias.dll + i686-w64-mingw32-strip $INSTDIR/Browser/xul.dll # cd $INSTDIR - ~/build/re-dzip.sh App/Firefox/omni.ja - ~/build/re-dzip.sh App/Firefox/webapprt/omni.ja - cd .. - ~/build/dzip.sh tor-browser-win32-gbuilt.zip ./FirefoxPortable/ + ~/build/re-dzip.sh Browser/omni.ja + if [ -f Browser/webapprt/omni.ja ]; then + ~/build/re-dzip.sh Browser/webapprt/omni.ja + fi + ~/build/dzip.sh tor-browser-win32-gbuilt.zip Browser cp tor-browser-win32-gbuilt.zip $OUTDIR diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 799456b..ff32c2e 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -40,7 +40,7 @@ script: | umask 0022 # mkdir -p $INSTDIR/bin/ - mkdir -p $INSTDIR/App/ + mkdir -p $INSTDIR/Tor/ mkdir -p $INSTDIR/Data/Tor/ mkdir -p $OUTDIR/ # @@ -48,7 +48,7 @@ script: | find -type f | xargs touch --date="$REFERENCE_DATETIME" make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 install - cp $INSTDIR/zlib/lib/*.dll $INSTDIR/App/ + cp $INSTDIR/zlib/lib/*.dll $INSTDIR/Tor/ cd .. # cd libevent @@ -57,7 +57,7 @@ script: | ./configure --disable-static --host=i686-w64-mingw32 --prefix=$INSTDIR/libevent make $MAKEOPTS make install - cp $INSTDIR/libevent/bin/*.dll $INSTDIR/App/ + cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/ cd .. # tar xzf openssl.tar.gz @@ -66,7 +66,7 @@ script: | ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl make make install - cp $INSTDIR/openssl/bin/*.dll $INSTDIR/App/ + cp $INSTDIR/openssl/bin/*.dll $INSTDIR/Tor/ cd .. # cd tor @@ -78,13 +78,13 @@ script: | make $MAKEOPTS make install cd .. - install -s $INSTDIR/bin/tor.exe $INSTDIR/App/ + install -s $INSTDIR/bin/tor.exe $INSTDIR/Tor/ cp $INSTDIR/share/tor/geoip $INSTDIR/Data/Tor/ # XXX: Geoip files.. # - cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libgcc_s_sjlj-1.dll $INSTDIR/App/ - cp -a /usr/lib/gcc/i686-w64-mingw32/4.6/libssp*.dll $INSTDIR/App/ + 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/ # cd $INSTDIR - ~/build/dzip.sh tor-win32-gbuilt.zip App/ Data/ + ~/build/dzip.sh tor-win32-gbuilt.zip Tor/ Data/ cp tor-win32-gbuilt.zip $OUTDIR/

1 0

[tor-browser-bundle/master] Bump Tor Launcher version (to handle directory reorg).
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit ba57aaa814a0d6d9d5957d847b96337124493431 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 18:20:21 2013 -0700 Bump Tor Launcher version (to handle directory reorg). --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index c601dc1..8f3585e 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,7 +5,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-17.0.9esr-3.0alpha4-build2 TOR_TAG=tor-0.2.4.17-rc -TORLAUNCHER_TAG=0.2.2-alpha +TORLAUNCHER_TAG=0.2.3-alpha TORBUTTON_TAG=1.6.2.1 HTTPSE_TAG=3.3.1 NSIS_TAG=v0.1

1 0

[tor-launcher/master] Bump version for 0.2.3-alpha.
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit 1cea694b917122779b13fcf51b1b55a0f1676378 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Oct 10 16:48:17 2013 -0700 Bump version for 0.2.3-alpha. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 7b2b133..95b3e53 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.2-alpha</em:version> + <em:version>0.2.3-alpha</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <!-- <em:optionsURL>chrome://torlauncher/content/preferences.xul</em:optionsURL>

1 0

[tor-launcher/master] Bug 9114: Reorganize bundle directory structure for TBB 3.0.
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit f644a38729a2687d095eaa992e1ea00a1d3bb0ed Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jul 25 10:14:59 2013 -0400 Bug 9114: Reorganize bundle directory structure for TBB 3.0. Include GeoIPFile (path) in tor command line args. --- 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 f4763c0..ed7e761 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -292,6 +292,9 @@ TorProcessService.prototype = return; } + var geoipFile = dataDir.clone(); + geoipFile.append("geoip"); + var args = []; if (torrcDefaultsFile) { @@ -302,6 +305,8 @@ TorProcessService.prototype = args.push(torrcFile.path); args.push("DataDirectory"); args.push(dataDir.path); + args.push("GeoIPFile"); + args.push(geoipFile.path); args.push("HashedControlPassword"); args.push(hashedPassword);

1 0

[tor-launcher/master] Bug 9114: Reorganize bundle directory structure for TBB 3.0.
by mikeperry＠torproject.org 11 Oct '13

11 Oct '13

commit 371d37d4d83932980eef6493084b55a71c76cc8c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Jul 17 17:00:37 2013 -0400 Bug 9114: Reorganize bundle directory structure for TBB 3.0. Use new default paths for tor, torrc, and tordatadir. Add support for torrc-defaults file. --- src/components/tl-process.js | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 96b53b5..f4763c0 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -268,6 +268,7 @@ TorProcessService.prototype = // rely on the TBB launcher to start Firefox from the right place. var exeFile = this._getTorFile("tor"); var torrcFile = this._getTorFile("torrc"); + var torrcDefaultsFile = this._getTorFile("torrc-defaults"); var dataDir = this._getTorFile("tordatadir"); var hashedPassword = this.mProtocolSvc.TorGetPassword(true); @@ -292,6 +293,11 @@ TorProcessService.prototype = } var args = []; + if (torrcDefaultsFile) + { + args.push("--defaults-torrc"); + args.push(torrcDefaultsFile.path); + } args.push("-f"); args.push(torrcFile.path); args.push("DataDirectory"); @@ -468,28 +474,23 @@ TorProcessService.prototype = else { // Get default path. - if (TorLauncherUtil.isMac) - { - if ("tor" == aTorFileType) - path = "Contents/MacOS/tor"; - else if ("torrc" == aTorFileType) - path = "Library/Vidalia/torrc"; - else if ("tordatadir" == aTorFileType) - path = "Contents/Resources/Data/Tor/"; - } - else if (TorLauncherUtil.isWindows) + if (TorLauncherUtil.isWindows) { if ("tor" == aTorFileType) - path = "App\\tor.exe"; + path = "Tor\\tor.exe"; + else if ("torrc-defaults" == aTorFileType) + path = "Data\\Tor\\torrc-defaults"; else if ("torrc" == aTorFileType) path = "Data\\Tor\\torrc"; else if ("tordatadir" == aTorFileType) path = "Data\\Tor"; } - else // Linux and others. + else // Linux, Mac OS and others. { if ("tor" == aTorFileType) - path = "App/tor"; + path = "Tor/tor"; + else if ("torrc-defaults" == aTorFileType) + path = "Data/Tor/torrc-defaults"; else if ("torrc" == aTorFileType) path = "Data/Tor/torrc"; else if ("tordatadir" == aTorFileType) @@ -522,13 +523,9 @@ TorProcessService.prototype = else { // For Firefox, paths are relative to the top of the TBB install. - var tbbBrowserDepth = 0; + var tbbBrowserDepth = 1; // Windows and Linux if (TorLauncherUtil.isMac) - tbbBrowserDepth = 5; - else if (TorLauncherUtil.isWindows) - tbbBrowserDepth = 3; - else // Linux and others. - tbbBrowserDepth = 2; + tbbBrowserDepth += 4; topDir = Cc["@mozilla.org/file/directory_service;1"] .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile);

1 0

[tor/maint-0.2.4] rewrite history to improve two changelog entries
by arma＠torproject.org 11 Oct '13

11 Oct '13

commit eb5d75e96afed76b968cb87365ba6e54cac35b2e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 21:17:19 2013 -0400 rewrite history to improve two changelog entries --- ChangeLog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd7f691..e08f3c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -308,8 +308,7 @@ Changes in version 0.2.4.7-alpha - 2012-12-24 network connection drastically changes. Should help with bug 3443. o Major features (IPv6): - - Tor now has (alpha) support for exiting to IPv6 addresses. To - enable it as an exit node, make sure that you have IPv6 + - Relays can now exit to IPv6 addresses: make sure that you have IPv6 connectivity, then set the IPv6Exit flag to 1. Also make sure your exit policy reads as you would like: the address * applies to all address families, whereas *4 is IPv4 address only, and *6 is IPv6 @@ -779,7 +778,7 @@ Changes in version 0.2.4.3-alpha - 2012-09-22 than it ran through the part of the loop before it had made its choice. Addresses ticket 6538. - Disable the use of Guard nodes when in Tor2WebMode. Guard usage - by tor2web clients allows hidden services to identity tor2web + by tor2web clients allows hidden services to identify tor2web clients through their repeated selection of the same rendezvous and introduction point circuit endpoints (their guards). Resolves ticket 6888.

1 0