commit c85e20f2cc40dcc9fdae18c2cf482e575766dd10 Merge: d486476 1e3b8a5 Author: Erinn Clark erinn@torproject.org Date: Mon Aug 6 02:16:43 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 | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.osx-2.3 | 3 ++- changelog.windows-2.3 | 3 ++- 10 files changed, 13 insertions(+), 10 deletions(-)