commit 31c0e3c93b2d8b003ab30bb90c69c2f01e97f29a
Merge: a1b4049 18d1057
Author: Erinn Clark <erinn(a)torproject.org>
Date: Mon Aug 27 07:14:01 2012 +0100
Merge branch '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(-)