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

[erinn at torproject.org]

commit b090e92a5514b8d9f65ca24a5ca733f2451b3b7e
Merge: 566fd4a 1d65c88
Author: Erinn Clark <erinn at torproject.org>
Date:   Sat Aug 11 08:52:43 2012 +0100

    Merge branch 'maint-2.3'

 build-scripts/linux-alpha.mk   |    5 +++--
 build-scripts/osx-alpha.mk     |    1 +
 build-scripts/windows-alpha.mk |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)