[tor-commits] [torbrowser/maint-2.2] Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2

[mikeperry at torproject.org]

commit 0576295b7731888fabcf71c454444e35ab1515e1
Merge: a9c5648 7945762
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Apr 27 10:46:26 2012 -0700

    Merge remote-tracking branch 'origin/maint-2.2' into maint-2.2

 README.LINUX-2.2                                   |   10 ++++----
 README.OSX-2.2                                     |   10 ++++----
 README.WIN-2.2                                     |   10 ++++----
 build-scripts/config/mozconfig-osx-x86_64          |    9 ++++---
 build-scripts/linux.mk                             |    6 ++--
 build-scripts/osx.mk                               |   22 ++++++++++----------
 build-scripts/versions.mk                          |    8 +++---
 build-scripts/windows.mk                           |    4 +-
 changelog.linux-2.2                                |   16 ++++++++++++++
 changelog.osx-2.2                                  |   19 +++++++++++++++++
 changelog.windows-2.2                              |   16 ++++++++++++++
 ...ize-HTTP-request-order-and-pipeline-depth.patch |   21 +++++++++++++++++-
 .../0001-Adapt-paths-etc-for-OS-X-TBB.patch        |    4 +-
 13 files changed, 112 insertions(+), 43 deletions(-)