commit f81c8eb936e2a555488ed6f9a9bfd5365dc96925 Merge: 6648eaf c518a3e Author: Erinn Clark erinn@torproject.org Date: Thu Apr 26 08:37:07 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

.../App/DefaultData/profile/prefs.js | 174 ------------------- .../config/firefox-portable/Data/profile/prefs.js | 174 ------------------- build-scripts/config/no-polipo-4.0.js | 168 ------------------ build-scripts/config/prefs.js | 178 ++++++++++++++++++++ build-scripts/config/windows-4.0.js | 172 ------------------- build-scripts/linux.mk | 6 +- build-scripts/osx.mk | 4 +- build-scripts/windows.mk | 5 +- ...nents.interfaces-lookupMethod-from-conten.patch | 2 +- ...0002-Make-Permissions-Manager-memory-only.patch | 2 +- ...-Make-Intermediate-Cert-Store-memory-only.patch | 2 +- .../firefox/0004-Add-a-string-based-cacheKey.patch | 2 +- .../0005-Block-all-plugins-except-flash.patch | 2 +- ...ontent-pref-service-memory-only-clearable.patch | 2 +- ...owser-exit-when-not-launched-from-Vidalia.patch | 2 +- .../0008-Disable-SSL-Session-ID-tracking.patch | 2 +- ...observer-event-to-close-persistent-connec.patch | 2 +- ...e-client-values-only-to-CSS-Media-Queries.patch | 2 +- ...11-Limit-the-number-of-fonts-per-document.patch | 2 +- ...ize-HTTP-request-order-and-pipeline-depth.patch | 2 +- .../0013-Rebrand-Firefox-to-TorBrowser.patch | 7 +- .../0014-Make-Download-manager-memory-only.patch | 57 +++++++ .../0015-Undo-some-Mozilla-braindamage.patch | 28 +++ .../0016-Add-DDG-and-StartPage-to-Omnibox.patch | 84 +++++++++ 24 files changed, 370 insertions(+), 711 deletions(-)