[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

commit bb64a64a4801bbb4fcb78bf8c76d7f0ddb41b390 Merge: 404a66e 48bbd95 Author: Erinn Clark <erinn@torproject.org> Date: Fri Apr 27 10:09:00 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 18 +++++++++--------- .../0001-Adapt-paths-etc-for-OS-X-TBB.patch | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-)