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

[erinn at torproject.org]

commit 18d1057df5a2e539d9d48552da3cad4962b5959e
Merge: 0aafb37 2c75280
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Aug 27 07:13:55 2012 +0100

    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/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    6 +++---
 build-scripts/windows.mk  |    2 +-
 changelog.linux-2.2       |    9 +++++++++
 changelog.osx-2.2         |    9 +++++++++
 changelog.windows-2.2     |    9 +++++++++
 10 files changed, 45 insertions(+), 18 deletions(-)