commit 203a451f17a30303e862759fa972dbd513066ec1 Merge: b079c16 3106539 Author: Erinn Clark erinn@torproject.org Date: Tue Sep 11 19:12:02 2012 +0100

Merge branch 'maint-2.2' into maint-2.3

README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 4 ++-- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- build-scripts/versions.mk | 6 +++--- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 7 +++++++ changelog.osx-2.2 | 7 +++++++ changelog.windows-2.2 | 7 +++++++ 10 files changed, 33 insertions(+), 12 deletions(-)