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

[flashproxy/master] Send flashproxy pools that include transport information.
by dcf＠torproject.org 20 Sep '13

20 Sep '13

commit 0eccc984c50bae6736b58a2e75ed3af8e41a7b1e Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Sep 18 16:11:42 2013 +0300 Send flashproxy pools that include transport information. For now, we only do the "websocket" transport. --- proxy/flashproxy.js | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 4367eff..db47184 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -562,6 +562,7 @@ function FlashProxy() { /* Flash proxy protocol revision. */ params = [["r", "1"]]; + params.push(["transport", "websocket"]); /* Clients we're currently handling. */ for (var i = 0; i < this.proxy_pairs.length; i++) params.push(["client", format_addr(this.proxy_pairs[i].client_addr)]);

1 0

[tor/master] Fix compilation with libevent 1
by nickm＠torproject.org 20 Sep '13

20 Sep '13

commit ee01e41937947eb77c02f552d59090c0ea280f98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 19 20:25:05 2013 -0400 Fix compilation with libevent 1 a9910d89 added trickery to make us work with interned strings and seccomp; it requires libevent 2. Fix for 9785; bug not in any released tor. --- src/or/dns.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/dns.c b/src/or/dns.c index 62ee4f3..a1fe0de 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1493,11 +1493,13 @@ configure_nameservers(int force) evdns_base_search_clear(the_evdns_base); evdns_base_clear_nameservers_and_suspend(the_evdns_base); } +#if defined(DNS_OPTION_HOSTSFILE) && defined(USE_LIBSECCOMP) if (flags & DNS_OPTION_HOSTSFILE) { flags ^= DNS_OPTION_HOSTSFILE; evdns_base_load_hosts(the_evdns_base, - sandbox_intern_string("/etc/resolv.conf")); + sandbox_intern_string("/etc/hosts")); } +#endif log_info(LD_EXIT, "Parsing resolver configuration in '%s'", conf_fname); if ((r = evdns_base_resolv_conf_parse(the_evdns_base, flags, sandbox_intern_string(conf_fname)))) {

1 0

[torbirdy/master] Update the ChangeLog
by sukhbir＠torproject.org 20 Sep '13

20 Sep '13

commit 3da9f99dbae30db4c4e4e5c57df666cdbba55e44 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Sep 19 20:20:48 2013 -0400 Update the ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 56b0c7a..240dd53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ toggle checking of new messages automatically for all accounts The minimum version of Thunderbird we now support is 10.0 `--throw-keyids' is now disabled by default + Add support for Thunderbird 24 (Gecko 17+) Add Persian translation (thanks to Nima) Add Czech translation (thanks to dope) Add Esperanto translation (thanks to Michael Moroni)

1 0

[torbirdy/master] Added support for Thunderbird 24
by sukhbir＠torproject.org 20 Sep '13

20 Sep '13

commit 6c18ff256b723b98c90fbac67e5db22b0d09e72b Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Thu Sep 19 20:17:54 2013 -0400 Added support for Thunderbird 24 --- chrome/content/accountpref.xul | 1 - chrome/content/preferences.js | 22 +++++++++++++++++----- chrome/content/preferences.xul | 15 +++++++++------ chrome/locale/en/torbirdy.dtd | 8 ++++---- components/torbirdy.js | 20 ++++++++++++++++---- install.rdf | 2 +- 6 files changed, 47 insertions(+), 21 deletions(-) diff --git a/chrome/content/accountpref.xul b/chrome/content/accountpref.xul index 6561188..baf419e 100644 --- a/chrome/content/accountpref.xul +++ b/chrome/content/accountpref.xul @@ -9,7 +9,6 @@ title="&torbirdy.accountprefs.title;" persist="screenX screenY width height" buttonlabelaccept="&torbirdy.accountprefs.save.button;" - buttonaccesskeyaccept="&torbirdy.accountprefs.save.key;" onload="return org.torbirdy.accountprefs.onLoad();" diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index 3461aa4..80a192b 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -143,11 +143,23 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { pub.getAccount = function() { var mailAccounts = []; var accounts = pub.acctMgr.accounts; - for (var i = 0; i < accounts.Count(); i++) { - var account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; - var name = account.prettyName; - if (!(name === "Local Folders")) { - mailAccounts.push(account); + + // Maintain Gecko 17+ and Gecko < 17 compatibility. + if (accounts.queryElementAt) { + for (var i = 0; i < accounts.length; i++) { + var account = accounts.queryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; + var name = account.prettyName; + if (!(name === "Local Folders")) { + mailAccounts.push(account); + } + } + } else { + for (var i = 0; i < accounts.Count(); i++) { + var account = accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount).incomingServer; + var name = account.prettyName; + if (!(name === "Local Folders")) { + mailAccounts.push(account); + } } } return mailAccounts; diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul index cd38163..10c0b59 100644 --- a/chrome/content/preferences.xul +++ b/chrome/content/preferences.xul @@ -8,17 +8,14 @@ xmlns:html="http://www.w3.org/1999/xhtml" title="&torbirdy.prefs.title;" persist="screenX screenY width height" - buttons="accept,cancel,extra1,extra2" + buttons="accept,cancel,extra2" buttonlabelaccept="&torbirdy.prefs.save.button;" buttonaccesskeyaccept="&torbirdy.prefs.save.key;" buttonlabelcancel="&torbirdy.prefs.cancel.button;" - buttonlabelextra1="&torbirdy.prefs.extra1.button;" buttonlabelextra2="&torbirdy.prefs.extra2.button;" - buttonaccesskeyextra1="&torbirdy.prefs.extra1.key;" buttonaccesskeyextra2="&torbirdy.prefs.extra2.key;" - ondialogextra1="return org.torbirdy.prefs.restoreDefaults();" - ondialogextra2="return org.torbirdy.prefs.testSettings();" + ondialogextra2="return org.torbirdy.prefs.restoreDefaults();" ondialogaccept="return org.torbirdy.prefs.onAccept();" onload="return org.torbirdy.prefs.onLoad();"> @@ -38,7 +35,7 @@  <tabpanel> - <vbox> + <vbox flex="1"> <radiogroup id="torbirdy-proxy-settings" oncommand="org.torbirdy.prefs.checkSetting();"> <radio accesskey="&torbirdy.prefs.recommended.key;" id="torbirdy-default-settings" label="&torbirdy.prefs.recommended.text;" selected="true"/> @@ -84,6 +81,12 @@ </radiogroup> + <separator orient="horizontal"/> + + <hbox align="right"> + <button label="&torbirdy.prefs.testproxy.button;" accesskey="&torbirdy.prefs.testproxy.key;" oncommand="org.torbirdy.prefs.testSettings();" /> + </hbox> + </vbox> </tabpanel> diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index f1acf7e..de5ecf9 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -12,10 +12,10 @@ <!ENTITY torbirdy.prefs.save.button "Save"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Cancel"> -<!ENTITY torbirdy.prefs.extra1.button "Restore Defaults"> -<!ENTITY torbirdy.prefs.extra1.key "d"> -<!ENTITY torbirdy.prefs.extra2.button "Test Proxy Settings"> -<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults"> +<!ENTITY torbirdy.prefs.extra2.key "d"> +<!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> +<!ENTITY torbirdy.prefs.testproxy.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy"> <!ENTITY torbirdy.prefs.privacy.label "Privacy"> <!ENTITY torbirdy.prefs.enigmail.label "Enigmail"> diff --git a/components/torbirdy.js b/components/torbirdy.js index bff74d1..5b976f6 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -227,8 +227,6 @@ const TorBirdyPrefs = { // Disable Telemetry completely. "toolkit.telemetry.enabled": false, - // And don't prompt for it. Yes, it should be set to true! - "toolkit.telemetry.prompted": true, // Disable Geolocation. "geo.enabled": false, @@ -468,10 +466,24 @@ TorBirdy.prototype = { // For only the first run (after that the user can configure the account if need be): // Iterate through all accounts and disable automatic checking of emails. var accounts = this.acctMgr.accounts; - for (var i = 0; i < accounts.Count(); i++) { - var account = accounts.QueryElementAt(i, Ci.nsIMsgAccount).incomingServer; + // To maintain compatibility between Gecko 17+ and Gecko < 17. + var allAccounts = []; + if (accounts.queryElementAt) { + for (var i = 0; i < accounts.length; i++) { + var account = accounts.queryElementAt(i, Ci.nsIMsgAccount).incomingServer; + allAccounts.push(account); + } + } else { + for (var i = 0; i < accounts.Count(); i++) { + var account = accounts.QueryElementAt(i, Ci.nsIMsgAccount).incomingServer; + allAccounts.push(account); + } + } + + for (var i = 0; i < allAccounts.length; i++) { // Save account settings for restoring later. + var account = allAccounts[i]; var key = account.key; var restorePrefs = ["check_new_mail", "login_at_startup", "check_time", "download_on_biff", diff --git a/install.rdf b/install.rdf index 150458f..0a6f6fc 100644 --- a/install.rdf +++ b/install.rdf @@ -13,7 +13,7 @@ <Description> <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> <em:minVersion>10.0</em:minVersion> - <em:maxVersion>23.*</em:maxVersion> + <em:maxVersion>24.*</em:maxVersion> </Description> </em:targetApplication>

1 0

[torbutton/master] Bug #8839: Switch Google redirect link to unfiltered startpage
by mikeperry＠torproject.org 19 Sep '13

19 Sep '13

commit ee9d8978e1419c76a3ac5856ba775467b5e45aad Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 19 13:41:54 2013 -0700 Bug #8839: Switch Google redirect link to unfiltered startpage This code is deactivated, but for completeness, let's switch it. --- src/defaults/preferences/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 670e322..c5e896f 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -196,7 +196,7 @@ pref("extensions.torbutton.asked_google_captcha", false); pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query="); pref("extensions.torbutton.redir_url.2", "http://www.bing.com/search?q="); pref("extensions.torbutton.redir_url.3", "http://search.yahoo.com/search?p="); -pref("extensions.torbutton.redir_url.4", "https://www.startpage.com/do/search?query="); +pref("extensions.torbutton.redir_url.4", "https://www.startpage.com/rto/search?query="); pref("extensions.torbutton.redir_url.5", "https://duckduckgo.com/?q="); pref("extensions.torbutton.fix_google_srch", true);

1 0

[torbutton/master] Bug 8839: Switch about:tor search link to unfiltered startpage link
by mikeperry＠torproject.org 19 Sep '13

19 Sep '13

commit 518623dc1de2fc2a75734a2ed3f9e850a65d3bf1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Sep 19 13:38:48 2013 -0700 Bug 8839: Switch about:tor search link to unfiltered startpage link --- src/chrome/locale/en/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 3e64f0a..89a01a2 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -32,7 +32,7 @@ - The sentence contains two embedded links for "securely" and - the search engine ("Startpage" or "DuckDuckGo"). --> -<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search"> +<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/"> <!ENTITY aboutTor.searchSP.privacy.beforeLink.label "Search "> <!ENTITY aboutTor.searchDDG.privacy.beforeLink.label "Search ">

1 0

[torbrowser/maint-2.4] TBB stable & beta stay on Torbutton 1.5.2. update changelogs, versions, etc.
by erinn＠torproject.org 19 Sep '13

19 Sep '13

commit 583284ce05d5978efba2afbed6f817fa45b5a2c1 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 19 20:56:49 2013 +0200 TBB stable & beta stay on Torbutton 1.5.2. update changelogs, versions, etc. --- README.LINUX-2.3 | 2 +- README.LINUX-2.4 | 2 +- README.OSX-2.3 | 2 +- README.OSX-2.4 | 2 +- README.WIN-2.3 | 2 +- README.WIN-2.4 | 2 +- build-scripts/linux.mk | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- changelog.linux-2.3 | 5 ++--- changelog.linux-2.4 | 5 ++--- changelog.osx-2.3 | 5 ++--- changelog.osx-2.4 | 5 ++--- changelog.windows-2.3 | 5 ++--- changelog.windows-2.4 | 5 ++--- 15 files changed, 21 insertions(+), 27 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 6a3ab66..47e5757 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.6.2 + \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.4.1 diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 1e7bb2a..417bbd2 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.6.2 + \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index f0b04cf..2365adf 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.6.2 + \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.4.1 diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 28799e5..14b5a73 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.6.2 + \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 1a8d30e..5822f93 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.6.2 + \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.4.1 diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 5b27db2..801216e 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.6.2 + \_ Torbutton 1.5.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d6c2bdc..a692b33 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -250,7 +250,7 @@ install-binaries: cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng - cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) + cp -d $(LIBPNG)/libpng16.so* $(LIBSDIR) # OpenSSL cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) chmod 644 $(LIBSDIR)/libssl.so* diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 4ddf7be..d9bbf5c 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -12,7 +12,7 @@ TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.6.2 +TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 HTTPSEVERYWHERE_VER=4.0development.12 PDFJS_VER=0.8.298 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 0926def..c2c1b69 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -12,7 +12,7 @@ TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.6.2 +TORBUTTON_VER=1.5.2 NOSCRIPT_VER=2.6.7.1 HTTPSEVERYWHERE_VER=3.4.1 OTR_VER=3.2.0 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index 9391f1b..1231fdf 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -2,15 +2,14 @@ Tor Browser Bundle (2.3.25-13); suite=linux * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… - * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 3.4.1 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor * Firefox patch changes: - - Disable filtered results in Startpage (closes: #8839) + - Disable filtered results in Startpage omnibox (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 19:56:35 CEST 2013 Tor Browser Bundle (2.3.25-12); suite=linux diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 8f7d655..6a9bad3 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -2,16 +2,15 @@ Tor Browser Bundle (2.4.17-beta-2); suite=linux * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… - * Update Torbutton to 1.6.2 * Update LibPNG to 1.6.3 * Update HTTPS Everywhere to 4.0development.12 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor * Firefox patch changes: - - Disable filtered results in Startpage (closes: #8839) + - Disable filtered results in Startpage omnibox (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 19:56:35 CEST 2013 Tor Browser Bundle (2.4.17-beta-1); suite=linux diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 94d8876..9db8a28 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -2,15 +2,14 @@ Tor Browser Bundle (2.3.25-13); suite=osx * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… - * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 3.4.1 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor * Firefox patch changes: - - Disable filtered results in Startpage (closes: #8839) + - Disable filtered results in Startpage omnibox (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 19:56:35 CEST 2013 Tor Browser Bundle (2.3.25-12); suite=osx diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index 8550b0f..583f60d 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -2,15 +2,14 @@ Tor Browser Bundle (2.4.17-beta-2); suite=osx * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… - * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 4.0development.12 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor * Firefox patch changes: - - Disable filtered results in Startpage (closes: #8839) + - Disable filtered results in Startpage omnibox (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 19:56:35 CEST 2013 Tor Browser Bundle (2.4.17-beta-1); suite=osx diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index b05d8ba..4a77e72 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -2,15 +2,14 @@ Tor Browser Bundle (2.3.25-13); suite=windows * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… - * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 3.4.1 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor * Firefox patch changes: - - Disable filtered results in Startpage (closes: #8839) + - Disable filtered results in Startpage omnibox (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 19:56:35 CEST 2013 Tor Browser Bundle (2.3.25-12); suite=windows diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index c77b364..0946e37 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -2,15 +2,14 @@ Tor Browser Bundle (2.4.17-beta-2); suite=windows * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… - * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 4.0development.12 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor * Firefox patch changes: - - Disable filtered results in Startpage (closes: #8839) + - Disable filtered results in Startpage omnibox (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 19:56:35 CEST 2013 Tor Browser Bundle (2.4.17-beta-1); suite=windows

1 0

[tor-launcher/master] Changes for TorBirdy/Thunderbird (thanks Sukhbir).
by brade＠torproject.org 19 Sep '13

19 Sep '13

commit f9ac43c369402f83fa67a3bda7d30bda165fc7c2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 19 14:22:16 2013 -0400 Changes for TorBirdy/Thunderbird (thanks Sukhbir). --- src/components/tl-process.js | 53 ++++++++++++++++++++++++++++-------------- src/install.rdf | 9 +++++++ 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index c4f977c..96b53b5 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -30,6 +30,8 @@ TorProcessService.prototype = kContractID : "@torproject.org/torlauncher-process-service;1", kServiceName : "Tor Launcher Process Service", kClassID: Components.ID("{FE7B4CAF-BCF4-4848-8BFF-EFA66C9AFDA1}"), + kThunderbirdID: "{3550f703-e582-4d05-9a08-453d09bdfdc6}", + kTorLauncherExtPath: "tor-launcher(a)torproject.org", // This could vary. kPrefPromptAtStartup: "extensions.torlauncher.prompt_at_startup", kInitialControlConnDelayMS: 25, @@ -242,7 +244,7 @@ TorProcessService.prototype = mProtocolSvc: null, mTorProcess: null, // nsIProcess mTorProcessStartTime: null, // JS Date.now() - mTBBTopDir: null, // nsIFile for top of TBB installation (cached) + mTorFileBaseDir: null, // nsIFile (cached) mControlConnTimer: null, mControlConnDelayMS: 0, mQuitSoon: false, // Quit was requested by the user; do so soon. @@ -503,29 +505,44 @@ TorProcessService.prototype = var f; if (isRelativePath) { - // Turn into an absolute path (relative to the top of the TBB install). - if (!this.mTBBTopDir) + // Turn into an absolute path. + if (!this.mTorFileBaseDir) { - var tbbBrowserDepth = 0; - if (TorLauncherUtil.isMac) - tbbBrowserDepth = 5; - else if (TorLauncherUtil.isWindows) - tbbBrowserDepth = 3; - else // Linux and others. - tbbBrowserDepth = 2; - - var topDir = Cc["@mozilla.org/file/directory_service;1"] - .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); - while (tbbBrowserDepth > 0) + var topDir; + var appInfo = Cc["@mozilla.org/xre/app-info;1"] + .getService(Ci.nsIXULAppInfo); + if (appInfo.ID == this.kThunderbirdID) { - topDir = topDir.parent; - tbbBrowserDepth--; + // For Thunderbird, paths are relative to this extension's folder. + topDir = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("ProfD", Ci.nsIFile); + topDir.append("extensions"); + topDir.append(this.kTorLauncherExtPath); + } + else + { + // For Firefox, paths are relative to the top of the TBB install. + var tbbBrowserDepth = 0; + if (TorLauncherUtil.isMac) + tbbBrowserDepth = 5; + else if (TorLauncherUtil.isWindows) + tbbBrowserDepth = 3; + else // Linux and others. + tbbBrowserDepth = 2; + + topDir = Cc["@mozilla.org/file/directory_service;1"] + .getService(Ci.nsIProperties).get("CurProcD", Ci.nsIFile); + while (tbbBrowserDepth > 0) + { + topDir = topDir.parent; + tbbBrowserDepth--; + } } - this.mTBBTopDir = topDir; + this.mTorFileBaseDir = topDir; } - f = this.mTBBTopDir.clone(); + f = this.mTorFileBaseDir.clone(); f.appendRelativePath(path); } else diff --git a/src/install.rdf b/src/install.rdf index a1c03e0..7b2b133 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -20,5 +20,14 @@ <em:maxVersion>10000.0</em:maxVersion> </Description> </em:targetApplication> +  + <em:targetApplication> + <Description> + <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id> + <em:minVersion>10.0</em:minVersion> + <em:maxVersion>23.*</em:maxVersion> + </Description> + </em:targetApplication> + </Description> </RDF>

1 0

[torbrowser/maint-2.4] update libpng filename
by erinn＠torproject.org 19 Sep '13

19 Sep '13

commit 6c4f11e3c9310efbf5356f8a007892fcfa7e22e8 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 19 18:28:08 2013 +0200 update libpng filename --- build-scripts/linux-alpha.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 073207b..4af7a84 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -268,7 +268,7 @@ install-binaries: cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.9 $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng - cp -d $(LIBPNG)/libpng15.so* $(LIBSDIR) + cp -d $(LIBPNG)/libpng16.so* $(LIBSDIR) # OpenSSL cp -d $(OPENSSL)/libssl.so* $(OPENSSL)/libcrypto.so* $(LIBSDIR) chmod 644 $(LIBSDIR)/libssl.so*

1 0

[torbrowser/maint-2.4] update changelogs for Firefox patch update, new libpng, and new torbutton
by erinn＠torproject.org 19 Sep '13

19 Sep '13

commit 78254012e3e5463498b34a24f409e46af334e079 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Sep 19 18:26:10 2013 +0200 update changelogs for Firefox patch update, new libpng, and new torbutton --- README.LINUX-2.3 | 2 +- README.LINUX-2.4 | 2 +- README.OSX-2.3 | 2 +- README.OSX-2.4 | 2 +- README.WIN-2.3 | 2 +- README.WIN-2.4 | 2 +- build-scripts/versions-alpha.mk | 4 ++-- build-scripts/versions.mk | 2 +- changelog.linux-2.3 | 5 ++++- changelog.linux-2.4 | 6 +++++- changelog.osx-2.3 | 5 ++++- changelog.osx-2.4 | 5 ++++- changelog.windows-2.3 | 5 ++++- changelog.windows-2.4 | 5 ++++- 14 files changed, 34 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.3 b/README.LINUX-2.3 index 47e5757..6a3ab66 100644 --- a/README.LINUX-2.3 +++ b/README.LINUX-2.3 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.5.2 + \_ Torbutton 1.6.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.4.1 diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 417bbd2..1e7bb2a 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.5.2 + \_ Torbutton 1.6.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 diff --git a/README.OSX-2.3 b/README.OSX-2.3 index 2365adf..f0b04cf 100644 --- a/README.OSX-2.3 +++ b/README.OSX-2.3 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.5.2 + \_ Torbutton 1.6.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.4.1 diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 14b5a73..28799e5 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.5.2 + \_ Torbutton 1.6.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 diff --git a/README.WIN-2.3 b/README.WIN-2.3 index 5822f93..1a8d30e 100644 --- a/README.WIN-2.3 +++ b/README.WIN-2.3 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.3.25 (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.5.2 + \_ Torbutton 1.6.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 3.4.1 diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 801216e..5b27db2 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -7,7 +7,7 @@ Included applications Vidalia 0.2.21 (with Qt 4.8.1) Tor 0.2.4.17-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.9esr - \_ Torbutton 1.5.2 + \_ Torbutton 1.6.2 |_ NoScript 2.6.7.1 |_ HTTPS-Everywhere 4.0development.12 |_ PDF Viewer 0.8.298 diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 3c2891b..4ddf7be 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.4.17-beta ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.16 +LIBPNG_VER=1.6.3 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable @@ -12,7 +12,7 @@ TOR_VER=0.2.4.17-rc PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.5.2 +TORBUTTON_VER=1.6.2 NOSCRIPT_VER=2.6.7.1 HTTPSEVERYWHERE_VER=4.0development.12 PDFJS_VER=0.8.298 diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index c2c1b69..0926def 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -12,7 +12,7 @@ TOR_VER=0.2.3.25 PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.9esr MOZBUILD_VER=1.5.1 -TORBUTTON_VER=1.5.2 +TORBUTTON_VER=1.6.2 NOSCRIPT_VER=2.6.7.1 HTTPSEVERYWHERE_VER=3.4.1 OTR_VER=3.2.0 diff --git a/changelog.linux-2.3 b/changelog.linux-2.3 index efcfd49..9391f1b 100644 --- a/changelog.linux-2.3 +++ b/changelog.linux-2.3 @@ -2,12 +2,15 @@ Tor Browser Bundle (2.3.25-13); suite=linux * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… + * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 3.4.1 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor + * Firefox patch changes: + - Disable filtered results in Startpage (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 17 19:12:57 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 Tor Browser Bundle (2.3.25-12); suite=linux diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index fb74b72..8f7d655 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -2,12 +2,16 @@ Tor Browser Bundle (2.4.17-beta-2); suite=linux * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… + * Update Torbutton to 1.6.2 + * Update LibPNG to 1.6.3 * Update HTTPS Everywhere to 4.0development.12 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor + * Firefox patch changes: + - Disable filtered results in Startpage (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 17 19:12:57 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 Tor Browser Bundle (2.4.17-beta-1); suite=linux diff --git a/changelog.osx-2.3 b/changelog.osx-2.3 index 909d432..94d8876 100644 --- a/changelog.osx-2.3 +++ b/changelog.osx-2.3 @@ -2,12 +2,15 @@ Tor Browser Bundle (2.3.25-13); suite=osx * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… + * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 3.4.1 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor + * Firefox patch changes: + - Disable filtered results in Startpage (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 17 19:12:57 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 Tor Browser Bundle (2.3.25-12); suite=osx diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index a961240..8550b0f 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -2,12 +2,15 @@ Tor Browser Bundle (2.4.17-beta-2); suite=osx * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… + * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 4.0development.12 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor + * Firefox patch changes: + - Disable filtered results in Startpage (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 17 19:12:57 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 Tor Browser Bundle (2.4.17-beta-1); suite=osx diff --git a/changelog.windows-2.3 b/changelog.windows-2.3 index 4658de3..b05d8ba 100644 --- a/changelog.windows-2.3 +++ b/changelog.windows-2.3 @@ -2,12 +2,15 @@ Tor Browser Bundle (2.3.25-13); suite=windows * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… + * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 3.4.1 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor + * Firefox patch changes: + - Disable filtered results in Startpage (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 17 19:12:57 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 Tor Browser Bundle (2.3.25-12); suite=windows diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index ff45651..c77b364 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -2,12 +2,15 @@ Tor Browser Bundle (2.4.17-beta-2); suite=windows * Update Firefox to 17.0.9esr https://www.mozilla.org/security/known-vulnerabilities/firefoxESR.html#fire… + * Update Torbutton to 1.6.2 * Update HTTPS Everywhere to 4.0development.12 * Update NoScript to 2.6.7.1 * Remove extraneous libevent libraries (closes: #9727) * Enable GCC hardening for Tor + * Firefox patch changes: + - Disable filtered results in Startpage (closes: #8839) - -- Erinn Clark <erinn(a)torproject.org> Tue Sep 17 19:12:57 CEST 2013 + -- Erinn Clark <erinn(a)torproject.org> Thu Sep 19 17:58:44 CEST 2013 Tor Browser Bundle (2.4.17-beta-1); suite=windows

1 0