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

Mon Aug 13 22:02:21 UTC 2012

commit b9eca1c3ea873a888f5e1b86b704617bc5b87af3
Merge: 98ab7bf e2b3a8f
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Aug 13 23:02:05 2012 +0100

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