[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

[mikeperry at torproject.org]

commit f8630e8ce0a5396f889b849819c31906161a4007
Merge: a7d1ca2 4128643
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Apr 24 17:29:53 2012 -0700

    Merge branch 'maint-2.2' into maint-2.3

 ...nents.interfaces-lookupMethod-from-conten.patch |   10 +-
 ...0002-Make-Permissions-Manager-memory-only.patch |    8 +-
 ...-Make-Intermediate-Cert-Store-memory-only.patch |    4 +-
 ...th-headers-before-the-modify-request-obse.patch |   52 -----
 .../firefox/0004-Add-a-string-based-cacheKey.patch |   85 +++++++
 .../firefox/0005-Add-a-string-based-cacheKey.patch |   85 -------
 .../0005-Block-all-plugins-except-flash.patch      |   85 +++++++
 ...ontent-pref-service-memory-only-clearable.patch |   37 +++
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  234 --------------------
 .../0007-Block-all-plugins-except-flash.patch      |   85 -------
 ...owser-exit-when-not-launched-from-Vidalia.patch |   46 ++++
 .../0008-Disable-SSL-Session-ID-tracking.patch     |   28 +++
 ...ontent-pref-service-memory-only-clearable.patch |   37 ---
 ...owser-exit-when-not-launched-from-Vidalia.patch |   46 ----
 ...observer-event-to-close-persistent-connec.patch |   40 ++++
 .../0010-Disable-SSL-Session-ID-tracking.patch     |   28 ---
 ...e-client-values-only-to-CSS-Media-Queries.patch |   72 ++++++
 ...11-Limit-the-number-of-fonts-per-document.patch |  228 +++++++++++++++++++
 ...observer-event-to-close-persistent-connec.patch |   40 ----
 ...e-client-values-only-to-CSS-Media-Queries.patch |   72 ------
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  234 ++++++++++++++++++++
 ...13-Limit-the-number-of-fonts-per-document.patch |  228 -------------------
 22 files changed, 866 insertions(+), 918 deletions(-)