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

[erinn at torproject.org]

commit 25e07929207ef34dcafa2752987bf53eefb37bf9
Merge: 4f99b60 c664f36
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Jun 6 16:56:59 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/vidalia.conf.ff               |   12 +-
 build-scripts/config/vidalia.conf.ff+pidgin        |   12 +-
 build-scripts/config/vidalia.conf.ff+pidgin-linux  |   12 +-
 build-scripts/config/vidalia.conf.ff-linux         |   12 +-
 build-scripts/config/vidalia.conf.ff-osx           |   12 +-
 build-scripts/linux.mk                             |    4 +-
 build-scripts/osx.mk                               |    2 +-
 build-scripts/versions.mk                          |    9 +-
 build-scripts/windows.mk                           |    4 +-
 ...nents.interfaces-lookupMethod-from-conten.patch |   10 +-
 ...0002-Make-Permissions-Manager-memory-only.patch |    8 +-
 ...-Make-Intermediate-Cert-Store-memory-only.patch |    8 +-
 .../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 |    8 +-
 .../0008-Disable-SSL-Session-ID-tracking.patch     |    6 +-
 ...observer-event-to-close-persistent-connec.patch |   10 +-
 ...e-client-values-only-to-CSS-Media-Queries.patch |    4 +-
 ...11-Limit-the-number-of-fonts-per-document.patch |   26 +-
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  251 ---------
 .../0012-Rebrand-Firefox-to-TorBrowser.patch       |   50 ++
 .../0013-Make-Download-manager-memory-only.patch   |   57 ++
 .../0013-Rebrand-Firefox-to-TorBrowser.patch       |   50 --
 .../0014-Add-DDG-and-StartPage-to-Omnibox.patch    |   84 +++
 .../0014-Make-Download-manager-memory-only.patch   |   57 --
 .../0015-Add-DDG-and-StartPage-to-Omnibox.patch    |   84 ---
 ...-nsICacheService.EvictEntries-synchronous.patch |   44 ++
 ...ven-Michaud-s-Mac-crashfix-patch-for-FF12.patch |  544 --------------------
 .../firefox/0016-Prevent-WebSocket-DNS-leak.patch  |  132 +++++
 ...-nsICacheService.EvictEntries-synchronous.patch |   44 --
 ...ize-HTTP-request-order-and-pipeline-depth.patch |  251 +++++++++
 ...th-headers-before-the-modify-request-obse.patch |   52 ++
 .../firefox/0018-Prevent-WebSocket-DNS-leak.patch  |  132 -----
 .../0001-Adapt-paths-etc-for-OS-X-TBB.patch        |   61 ---
 35 files changed, 776 insertions(+), 1314 deletions(-)