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

[erinn at torproject.org]

commit 708d30060df5041ff43d850fd9aa71117e5796a1
Merge: 848b923 60770df
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Mar 16 18:31:23 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 README.LINUX-2.2                      |    8 ++++----
 README.OSX-2.2                        |    8 ++++----
 README.WIN-2.2                        |    8 ++++----
 build-scripts/config/no-polipo-4.0.js |    1 +
 build-scripts/config/windows-4.0.js   |    1 +
 build-scripts/linux.mk                |    3 ++-
 build-scripts/osx.mk                  |    7 ++++---
 build-scripts/versions.mk             |    6 +++---
 build-scripts/windows.mk              |    3 ++-
 changelog.linux-2.2                   |   13 +++++++++++++
 changelog.osx-2.2                     |   12 ++++++++++++
 changelog.windows-2.2                 |   12 ++++++++++++
 12 files changed, 62 insertions(+), 20 deletions(-)