[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

[mikeperry at torproject.org]

commit 10f5f612da0fedf4e56e734a2a00abebd9086f3b
Merge: 58af48a 67d8c25
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Tue Oct 29 19:01:10 2013 -0700

    Merge branch 'maint-2.4'

 build-scripts/config/pound_tor.js                  |   17 +-
 ...-Block-Components.interfaces-from-content.patch |   14 +-
 ...0002-Make-Permissions-Manager-memory-only.patch |   10 +-
 ...-Make-Intermediate-Cert-Store-memory-only.patch |   10 +-
 .../firefox/0004-Add-a-string-based-cacheKey.patch |   14 +-
 .../0005-Block-all-plugins-except-flash.patch      |   14 +-
 ...ontent-pref-service-memory-only-clearable.patch |   10 +-
 ...owser-exit-when-not-launched-from-Vidalia.patch |   45 -
 .../0008-Disable-SSL-Session-ID-tracking.patch     |   28 -
 ...observer-event-to-close-persistent-connec.patch |   40 -
 ...ice-and-system-specific-CSS-Media-Queries.patch |  147 ----
 ...11-Limit-the-number-of-fonts-per-document.patch |  451 ----------
 .../0012-Rebrand-Firefox-to-TorBrowser.patch       |   59 --
 .../0013-Make-Download-manager-memory-only.patch   |   57 --
 .../0014-Add-DDG-and-StartPage-to-Omnibox.patch    |  103 ---
 ...-nsICacheService.EvictEntries-synchronous.patch |   43 -
 .../firefox/0016-Prevent-WebSocket-DNS-leak.patch  |  133 ---
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  791 -----------------
 ...er-event-to-filter-the-Drag-Drop-url-list.patch |   74 --
 ...d-mozIThirdPartyUtil.getFirstPartyURI-API.patch |  164 ----
 .../0020-Add-canvas-image-extraction-prompt.patch  |  548 ------------
 ...nt-window-coordinates-for-mouse-event-scr.patch |   77 --
 ...se-physical-screen-info.-via-window-and-w.patch |  310 -------
 ...not-expose-system-colors-to-CSS-or-canvas.patch |  631 --------------
 ...solate-the-Image-Cache-per-url-bar-domain.patch |  922 --------------------
 .../0025-nsIHTTPChannel.redirectTo-API.patch       |  474 ----------
 ...26-Isolate-DOM-storage-to-first-party-URI.patch |  776 ----------------
 ...27-Remove-This-plugin-is-disabled-barrier.patch |   46 -
 .../0028-Use-Optimistic-Data-SOCKS-variant.patch   |   82 --
 .../0029-Disable-library-timestamping.patch        |   27 -
 30 files changed, 49 insertions(+), 6068 deletions(-)