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

[erinn at torproject.org]

commit 9a21a471e728b411f0fda7e8522a76204f9cda8d
Merge: 6f2a09b ddb8796
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Oct 8 10:03:19 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/windows.mk |    2 +-
 changelog.linux-2.2      |   10 ++++++++++
 changelog.osx-2.2        |    9 +++++++++
 changelog.windows-2.2    |    9 +++++++++
 9 files changed, 43 insertions(+), 15 deletions(-)