commit a7e73ba46e0e61cec4a9bfe040c2b10f7fadab3a Merge: 244fba9 63b9ccd Author: Erinn Clark <erinn@torproject.org> Date: Sun Jun 23 23:24:07 2013 -0300 Merge branch 'maint-2.4' README.LINUX-2.3 | 2 +- README.LINUX-2.4 | 2 +- README.OSX-2.3 | 2 +- README.OSX-2.4 | 2 +- README.WIN-2.3 | 2 +- README.WIN-2.4 | 2 +- build-scripts/versions-alpha.mk | 2 +- build-scripts/versions.mk | 2 +- changelog.linux-2.3 | 3 ++- changelog.linux-2.4 | 4 ++-- changelog.osx-2.3 | 4 ++-- changelog.osx-2.4 | 4 ++-- changelog.windows-2.3 | 4 ++-- changelog.windows-2.4 | 4 ++-- 14 files changed, 20 insertions(+), 19 deletions(-)