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

[erinn at torproject.org]

commit 848b92357976bac6fb1b91f587aae690c084668f
Merge: aa6db3c 941bac0
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Mar 16 15:33:25 2012 -0300

    Merge branch 'maint-2.3'

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