commit 4d1bbc978911e5abaf071cdb177f946ba530104c Merge: b9eca1c cc4a6f9 Author: Erinn Clark <erinn@torproject.org> Date: Mon Aug 13 23:09:26 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)