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

[erinn at torproject.org]

commit 346321ee3c51355b44130f275ab3acf8539fd577
Merge: 57fae9c 9ab5820
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Aug 10 23:34:26 2013 +0200

    Merge branch 'maint-2.4'

 build-scripts/config/pound_tor.js |    1 +
 build-scripts/linux-alpha.mk      |    2 +-
 build-scripts/linux.mk            |    2 +-
 build-scripts/osx-alpha.mk        |    2 +-
 build-scripts/osx.mk              |    2 +-
 build-scripts/windows-alpha.mk    |    2 +-
 build-scripts/windows.mk          |    2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)