commit 0fe45fd2e59ec9b9ff4726dc64f85ab4d514d952 Merge: 22c493a ab533c3 Author: Erinn Clark <erinn@torproject.org> Date: Tue Feb 5 18:13:05 2013 +0100 Merge branch 'maint-2.3' into maint-2.4 README.LINUX-2.3 | 6 +++--- README.OSX-2.3 | 6 +++--- README.WIN-2.3 | 6 +++--- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 8 ++++++++ changelog.osx-2.3 | 8 ++++++++ changelog.windows-2.3 | 8 ++++++++ 10 files changed, 39 insertions(+), 15 deletions(-)