commit 75b70e97299d6997a7bbf47f38fbe77a32bba197 Merge: 015742f a353d7d Author: Erinn Clark <erinn@torproject.org> Date: Sat Apr 28 18:18:54 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 4 ++-- build-scripts/versions.mk | 2 +- changelog.osx-2.2 | 7 +++++++ 3 files changed, 10 insertions(+), 3 deletions(-)