commit fdc017ba82079c5557a0e75f1153fcd7047b1b12 Merge: 464b80f 37575c4 Author: Erinn Clark <erinn@torproject.org> Date: Fri Mar 16 02:11:59 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 ...nents.interfaces-lookupMethod-from-conten.patch | 8 ++-- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 6 +- ...th-headers-before-the-modify-request-obse.patch | 10 ++-- .../firefox/0005-Add-a-string-based-cacheKey.patch | 8 ++-- ...6-Randomize-HTTP-pipeline-order-and-depth.patch | 41 ++++++++++---------- .../0007-Block-all-plugins-except-flash.patch | 12 +++--- ...ontent-pref-service-memory-only-clearable.patch | 8 ++-- ...owser-exit-when-not-launched-from-Vidalia.patch | 6 +- .../0010-Disable-SSL-Session-ID-tracking.patch | 6 +- ...observer-event-to-close-persistent-connec.patch | 8 ++-- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...13-Limit-the-number-of-fonts-per-document.patch | 14 +++--- 13 files changed, 66 insertions(+), 65 deletions(-)