commit 643f11b28be43aad9c97d71a57406b848ed2c7e3 Merge: 92ca496 adddd53 Author: Erinn Clark erinn@torproject.org Date: Thu Aug 8 15:14:21 2013 +0200

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 | 4 ++-- changelog.linux-2.4 | 2 +- changelog.osx-2.3 | 2 +- changelog.osx-2.4 | 2 +- changelog.windows-2.3 | 2 +- changelog.windows-2.4 | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-)