commit bf31618d8680a0e780a448324cdafcb420365a7f Merge: ca4d7bc 43f99f2 Author: Erinn Clark <erinn@torproject.org> Date: Thu Jun 7 18:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/osx.mk | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)