commit fe48788c30de59f30125443f92655d54874bed56 Merge: 25e0792 db595ac Author: Erinn Clark erinn@torproject.org Date: Wed Jun 6 17:21:06 2012 -0300

Merge branch 'maint-2.2' into maint-2.3

README.LINUX-2.2 | 10 +++++----- README.OSX-2.2 | 10 +++++----- README.WIN-2.2 | 10 +++++----- build-scripts/versions.mk | 10 +++++----- build-scripts/windows.mk | 17 +++++++++-------- 5 files changed, 29 insertions(+), 28 deletions(-)