commit a35e35ef59cc448f8669e7f3625ba986502ffb4b Merge: 3afeae4 058c040 Author: Erinn Clark erinn@torproject.org Date: Tue May 7 20:08:12 2013 -0300

Merge branch 'maint-2.4'

README.LINUX-2.3 | 4 ++-- README.OSX-2.3 | 4 ++-- README.WIN-2.3 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.3 | 29 +++++++++++++++++++++++++++++ changelog.osx-2.3 | 29 +++++++++++++++++++++++++++++ changelog.windows-2.3 | 30 ++++++++++++++++++++++++++++++ 10 files changed, 100 insertions(+), 12 deletions(-)