commit ed7f332c4dc8f083b61f4834217bfbfe0e5396c2 Merge: 97b8d22 e46b9c9 Author: Erinn Clark erinn@torproject.org Date: Fri Jul 20 15:11:49 2012 +0100

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/versions.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 12 ++++++++++++ 7 files changed, 39 insertions(+), 10 deletions(-)