diff -Nru tor-browser-3.6/debian/changelog tor-browser-3.6.1/debian/changelog --- tor-browser-3.6/debian/changelog 2014-04-30 09:28:05.000000000 +0000 +++ tor-browser-3.6.1/debian/changelog 2014-05-07 16:41:45.000000000 +0000 @@ -1,3 +1,9 @@ +tor-browser (3.6.1-1~webupd8~0) trusty; urgency=medium + + * new upstream release + + -- Alin Andrei Wed, 07 May 2014 19:41:33 +0200 + tor-browser (3.6-1~webupd8~0) trusty; urgency=medium * new upstream release diff -Nru tor-browser-3.6/debian/rules tor-browser-3.6.1/debian/rules --- tor-browser-3.6/debian/rules 2014-04-30 09:26:43.000000000 +0000 +++ tor-browser-3.6.1/debian/rules 2014-05-07 16:41:15.000000000 +0000 @@ -34,11 +34,11 @@ install -Dm 644 $(CURDIR)/debian/tor-browser-en.desktop $(CURDIR)/debian/tor-browser/usr/share/applications/tor-browser-en.desktop install -Dm 755 $(CURDIR)/debian/tor-browser-en.sh $(CURDIR)/debian/tor-browser/usr/bin/tor-browser-en.sh ifeq ($(DEB_HOST_ARCH),amd64) - install -Dm 644 tor-browser-linux64-3.6_en-US.tar.xz \ - $(CURDIR)/debian/tor-browser/opt/tor-browser-en/tor-browser-linux64-3.6_en-US.tar.xz + install -Dm 644 tor-browser-linux64-3.6.1_en-US.tar.xz \ + $(CURDIR)/debian/tor-browser/opt/tor-browser-en/tor-browser-linux64-3.6.1_en-US.tar.xz else - install -Dm 644 tor-browser-linux32-3.6_en-US.tar.xz \ - $(CURDIR)/debian/tor-browser/opt/tor-browser-en/tor-browser-linux32-3.6_en-US.tar.xz + install -Dm 644 tor-browser-linux32-3.6.1_en-US.tar.xz \ + $(CURDIR)/debian/tor-browser/opt/tor-browser-en/tor-browser-linux32-3.6.1_en-US.tar.xz endif # Build architecture-independent files here. diff -Nru tor-browser-3.6/debian/tor-browser-en.sh tor-browser-3.6.1/debian/tor-browser-en.sh --- tor-browser-3.6/debian/tor-browser-en.sh 2014-04-30 09:25:54.000000000 +0000 +++ tor-browser-3.6.1/debian/tor-browser-en.sh 2014-05-07 16:40:51.000000000 +0000 @@ -24,8 +24,8 @@ case $ARCH in # the version can be different, depending on architecture # to be modified on each release - 'i686'|'i586'|'i386' ) VERSION='3.6'; arch='32';; - 'x86_64' ) VERSION='3.6'; arch='64';; + 'i686'|'i586'|'i386' ) VERSION='3.6.1'; arch='32';; + 'x86_64' ) VERSION='3.6.1'; arch='64';; esac LANGUAGE="en-US" Binary files /tmp/E3iEpkHcXe/tor-browser-3.6/tor-browser_en-US/Browser/browser/omni.ja and /tmp/0q01hnf4_A/tor-browser-3.6.1/tor-browser_en-US/Browser/browser/omni.ja differ Binary files /tmp/E3iEpkHcXe/tor-browser-3.6/tor-browser_en-US/Data/Browser/profile.default/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi and /tmp/0q01hnf4_A/tor-browser-3.6.1/tor-browser_en-US/Data/Browser/profile.default/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi differ diff -Nru tor-browser-3.6/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/Changelog tor-browser-3.6.1/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/Changelog --- tor-browser-3.6/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/Changelog 2000-01-01 00:00:00.000000000 +0000 +++ tor-browser-3.6.1/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/Changelog 2000-01-01 00:00:00.000000000 +0000 @@ -1,3 +1,85 @@ +3.5.1 (2014-04-25) + * Revert https://github.com/EFForg/https-everywhere/pull/134 due to YouTube + breakage. + * Re-enable ability to see all rulesets in enable/disable dialog. + * Added more Debian coverage. + * Fixes to Doubleclick, Guardian, Heroku, Home Depot, HypeMachine, IMDB, + Justin.tv, Kikatek, Mozilla, MyFitnessPal, Pinterest, XKCD, Reuters, + Technet, Tumblr, Wordpress, Yandex, Youtube, Flickr. + * Fix Australis icon positioning: + https://github.com/EFForg/https-everywhere/pull/216 + +chrome-2014.4.25 + * Ruleset fixes (same as 3.5.1) + +chrome-2014.4.16 + * Make Chrome build script compatible with Chrome release scripts. + * Fix disappearing icon: https://github.com/EFForg/https-everywhere/pull/220 + * Fix XKCD images + +chrome-2014.4.14.1 + * Revert back to chrome-2014.1.3 because of bug in Chrome release script. + +chrome-2014.4.14 + * Add SV localization + * Add persistent user-generated rules, thanks to Vijay P.: + https://github.com/EFForg/https-everywhere/pull/60 + * Use onBeforeRedirect for redirect loop detection: + https://github.com/EFForg/https-everywhere/pull/199 + * Remove unneeded onBeforeSendHeaders listener: + https://github.com/EFForg/https-everywhere/pull/172 + * Fix host-only cookie bug: + https://github.com/EFForg/https-everywhere/pull/166 + * Split incognito mode: + https://github.com/EFForg/https-everywhere/pull/165 + * Cleanup pageAction icon code: + https://github.com/EFForg/https-everywhere/pull/173 + * Add and modify some rulesets (same as 3.5) + +3.5 (2014-04-14) + * Merge all non-ruleset changes from 4.0development.16 + * Merge all new/modified rulesets from 4.0development.16 that are + in the Alexa Top 1000 using utils/alexa-ruleset-checker.py. For a full list, + see utils/alexa-logs/07042014.log. + +4.0development.16 (2014-04-14) + * Restore code that loads custom rule files: + https://github.com/EFForg/https-everywhere/pull/156 + * Use loadContext interface to get windows associated with requests + * Reduce annoying logging messages + * Report cert warning pages to SSL Observatory + * Remove SSL Observatory observers when disabled + * Don't set LOAD_REPLACE flag: + https://github.com/EFForg/https-everywhere/pull/134 + * Add script to merge rulesets in Alexa Top 1M, thanks to Claudio MOretti: + https://github.com/EFForg/https-everywhere/pull/149 + * 8 new rules + * 59 modified rules + +4.0development.15 (2014-02-05) + * Replace the single XML ruleset library with an sqlite database of rulesets + that are loaded on demand + - reduces startup time by a factor of 10-20: + https://trac.torproject.org/projects/tor/ticket/10174 + - reduces RAM usage https://trac.torproject.org/projects/tor/ticket/4804 + - Is scalable: https://trac.torproject.org/projects/tor/ticket/6118 + Further analysis in this thread: + https://lists.eff.org/pipermail/https-everywhere/2014-January/001919.html + * Implement a cleanup case to recover from some Observatory UI code bugs that + would leave the Observatory off incorrectly. + https://trac.torproject.org/projects/tor/ticket/10728 + * Fix observatory - private browsing mode interaction + https://trac.torproject.org/projects/tor/ticket/10208 + * Ship 848 new rulesets + * Update cert whitelist + +3.5android.0 (2014-01-31) + * First Firefox for Android release! :D + * Major UI changes for mobile compatibility + * Android channel update URL set to + https://www.eff.org/files/https-everywhere-android-update-2048.rdf + * Updated rulesets: Freenode, Imgur + 3.4.5 (2014-01-03) * Updated license * Updated README.md @@ -16,7 +98,6 @@ * Reload page when rule is disabled * Upgrade URI.js * Add fi translation - * Enable mixed content rules for Opera 3.4.4tbb (2013-12-06) * Pseudorelease, just for Tor Browser Bundle usage @@ -36,7 +117,7 @@ * Update Observatory blacklist * Bump maxVersion from Firefox 25 to 28. -4.0development.14 (2013-12-02) +4.0development.14 (2013-11-21) * Deprecate the ContentPolicy API, fixing a crash bug lurking since Firefox 20: https://bugzilla.mozilla.org/show_bug.cgi?id=939180 @@ -45,10 +126,6 @@ * Ship 438 new rulesets * Update Observatory blacklist -chrome-2013.10.16 - * Various ruleset fixes - * Fix unsafe loop variables - 4.0development.13 (2013-10-04) * HTTPS Everywhere builds are now deterministic! * Numerous new and updated rules @@ -60,6 +137,38 @@ Bing, Cengage * New rules from dev: IPTorrents.com, TvTorrents +4.0development.12 (2013-09-12) + * Fix clients1.google.com OSCP meltdown + https://trac.torproject.org/projects/tor/ticket/9713 + * Updated rules: ConnMan, Viddler.com, ISC, GNOME, Dozuki, Thingiverse, Box, + ComputerWorld, Makerbot, McClatchy Interactive.com, Mozilla, Ohio State + University, printrbot, Thingiverse, Tradedoubler, XiTi.com, Flameeyes, Open + Clipart Library, Musopen, CERN, FilZilla, Google Services, Linux Foundation, + Debian, Python.org, Ardour, Netmarble, Drexel University, Guifi.net, + net-security.org, University of California, WordPress blogs, Perl.org + * New rules: Akira.org, AntiPolygraph.org, Banu.com, break.com, Click and + Pledge.com, DataCoup.com, linux-sunxi.org, Lockbox.com, PSC.edu, University + of Greifswald, University of Rostock, WIMM.com, ZeusClicks.com, + gayorrents.net, Addison.com.hk, Auto Ad Manager.com, Blutmagie.de, + Brixwork.com, HDtracks.com, hostname.sk, iPXE.org, Linn Records.com, + Navigant Research.com, OpenLDAP.org, Quotes and Sayings.com, Solid-Run.com, + TU-Dresden.de, Tux.Org, Ultrasurf.us, Zamzar.com, chaox.net, digilinux.ru, + iNaturalist.org, IUCNredlist.org, jensge.org, Libre Graphics World.org, + NAB.org, PengPod.com, pythonhosted.org, randombit.net, factorable.net, + JoeyH.name, Acunetix.com, Alex Cabal.com, Altera.com, Commotionwireless.net, + CounterMail.com, dotplex.de, Dyne.org, finalrewind.net, Keelog.com, + Mailinator.com, My Shadow.com, OpenMailBox.org, PwdHash.com, Silent + Sender.com, Standard Ebooks.com, Tarasic.com.tw, Barracuda.com + +4.0development.11 (2013-08-30) + * Notify users who have been accidentally updated from stable to dev + https://trac.torproject.org/projects/tor/ticket/9600 + * Added and updated numerous rules, including Craigslist + * Fixes toolbar button size + https://trac.torproject.org/projects/tor/ticket/9511 + * Declare loop variables with var to avoid global memory leaks + * Updated localizations + 3.4.1 * Fix typo resulting in variable leak in get_prefs(), thanks to Jérémy Bobbio @@ -78,7 +187,7 @@ - avoid performance hits from repeatedly re-testing rulesets - other possible weirdness -chrome-2013.8.16 +chrome-2013-8.16 * Includes all fixes from 3.3, 3.3.1, and 4.0development.10 * This will be the first Chromium release where the bulk of the rules that are broken because of mixed content will be disabled by default diff -Nru tor-browser-3.6/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/chrome/content/about.xul tor-browser-3.6.1/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/chrome/content/about.xul --- tor-browser-3.6/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/chrome/content/about.xul 2000-01-01 00:00:00.000000000 +0000 +++ tor-browser-3.6.1/tor-browser_en-US/Data/Browser/profile.default/extensions/https-everywhere@eff.org/chrome/content/about.xul 2000-01-01 00:00:00.000000000 +0000 @@ -9,19 +9,19 @@ xmlns:html="http://www.w3.org/1999/xhtml" buttons="accept" title="&https-everywhere.about.title;" - width="750" - height="540" + width="640" + height="480" align="center">