[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

commit e9152e6400f2d475ab671a887d260dd2f8c2e586 Merge: 6133127 faeafe2 Author: Erinn Clark <erinn@torproject.org> Date: Sun Nov 17 17:05:40 2013 -0200 Merge branch 'maint-2.4' build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/windows-alpha.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)