commit 5ad53f607a524fbf761a792067cf4f174527811b Merge: 4bbf121 3bb2cc1 Author: Erinn Clark erinn@torproject.org Date: Fri Sep 7 12:35:55 2012 +0100

Merge branch 'maint-2.3'

build-scripts/versions-alpha.mk | 6 +- ...nents.interfaces-lookupMethod-from-conten.patch | 10 +- ...0002-Make-Permissions-Manager-memory-only.patch | 16 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 8 +- .../alpha/0004-Add-a-string-based-cacheKey.patch | 26 +- .../0005-Block-all-plugins-except-flash.patch | 14 +- ...ontent-pref-service-memory-only-clearable.patch | 10 +- .../0007-Disable-SSL-Session-ID-tracking.patch | 4 +- ...ice-and-system-specific-CSS-Media-Queries.patch | 116 +++++++ ...observer-event-to-close-persistent-connec.patch | 40 --- ...ice-and-system-specific-CSS-Media-Queries.patch | 116 ------- .../0009-Make-Download-manager-memory-only.patch | 57 ++++ .../0010-Add-DDG-and-StartPage-to-Omnibox.patch | 84 +++++ .../alpha/0010-Rebrand-Firefox-to-TorBrowser.patch | 50 --- .../0011-Make-Download-manager-memory-only.patch | 57 ---- ...-nsICacheService.EvictEntries-synchronous.patch | 44 +++ .../0012-Add-DDG-and-StartPage-to-Omnibox.patch | 84 ----- ...owser-exit-when-not-launched-from-Vidalia.patch | 45 +++ ...13-Limit-the-number-of-fonts-per-document.patch | 225 +++++++++++++ ...-nsICacheService.EvictEntries-synchronous.patch | 44 --- .../alpha/0014-Prevent-WebSocket-DNS-leak.patch | 132 -------- ...observer-event-to-close-persistent-connec.patch | 40 +++ ...owser-exit-when-not-launched-from-Vidalia.patch | 45 --- .../alpha/0015-Rebrand-Firefox-to-TorBrowser.patch | 59 ++++ ...16-Limit-the-number-of-fonts-per-document.patch | 225 ------------- .../alpha/0016-Prevent-WebSocket-DNS-leak.patch | 133 ++++++++ ...ize-HTTP-request-order-and-pipeline-depth.patch | 26 +- ...Adapt-Steven-Michaud-s-Mac-crashfix-patch.patch | 139 ++++---- ...9-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 345 +++++++++++++++++++ .../alpha/0019-Fix-Firefox-build-process.patch | 267 --------------- ...0-Add-a-redirect-API-for-HTTPS-Everywhere.patch | 346 -------------------- 31 files changed, 1276 insertions(+), 1537 deletions(-)