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

[erinn at torproject.org]

commit 4d3205d38fa13fa05354e17e2b134a0f8dedbac1
Merge: 1939421 2b4266a
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Nov 20 14:22:02 2012 +0000

    Merge branch 'maint-2.2' into maint-2.3

 README.LINUX-2.2         |    6 +++---
 README.OSX-2.2           |    6 +++---
 README.WIN-2.2           |    6 +++---
 build-scripts/linux.mk   |    2 +-
 build-scripts/osx.mk     |    2 +-
 build-scripts/windows.mk |    2 +-
 changelog.linux-2.2      |    8 ++++++++
 changelog.osx-2.2        |    8 ++++++++
 changelog.windows-2.2    |    8 ++++++++
 9 files changed, 36 insertions(+), 12 deletions(-)