commit 6ae1b78e59381b532cc1b60e940bd4df1a7ef1b8 Merge: f8897bb 894634d Author: Erinn Clark erinn@torproject.org Date: Mon May 28 15:53:44 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

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