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

[erinn at torproject.org]

commit d827e9fffffb27fe351f42d2f4159734ae8565ad
Merge: 61565f1 04d3334
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Dec 21 13:25:11 2011 +0000

    Merge branch 'patches9' into maint-2.2

 ...nents.interfaces-lookupMethod-from-conten.patch |   10 ++--
 ...0002-Make-Permissions-Manager-memory-only.patch |   14 ++--
 ...-Make-Intermediate-Cert-Store-memory-only.patch |    8 +-
 ...th-headers-before-the-modify-request-obse.patch |   12 ++--
 .../firefox/0005-Add-a-string-based-cacheKey.patch |   12 ++--
 ...6-Randomize-HTTP-pipeline-order-and-depth.patch |    6 +-
 .../0007-Block-all-plugins-except-flash.patch      |   14 ++--
 ...ontent-pref-service-memory-only-clearable.patch |   10 ++--
 ...owser-exit-when-not-launched-from-Vidalia.patch |    8 +-
 .../0010-Disable-SSL-Session-ID-tracking.patch     |   10 ++--
 ...observer-event-to-close-persistent-connec.patch |    4 +-
 ...e-client-values-only-to-CSS-Media-Queries.patch |   72 ++++++++++++++++++++
 12 files changed, 126 insertions(+), 54 deletions(-)