commit d4864766a26d31edccccb960ab96a88c46b79cb0 Merge: a82e8fb 5691211 Author: Erinn Clark erinn@torproject.org Date: Mon Aug 6 02:02:49 2012 +0100

Merge branch 'maint-2.3'

README.LINUX-2.3 | 2 +- README.OSX-2.3 | 2 +- README.WIN-2.3 | 2 +- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 4 ++-- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 12 ++++++++++++ changelog.osx-2.3 | 11 +++++++++++ changelog.windows-2.3 | 11 +++++++++++ 9 files changed, 41 insertions(+), 7 deletions(-)