commit aa51199d160b836dbb46a2af705806074d498033 Merge: 8b21ddd 279edcd Author: Erinn Clark <erinn@torproject.org> Date: Thu Oct 18 08:42:28 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 | 4 ++-- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 8 ++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 8 ++++++++ 10 files changed, 35 insertions(+), 11 deletions(-)