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

[erinn at torproject.org]

commit aa6db3c9d74e58fd727e23f54448e2de8fa78bd4
Merge: b72e466 877c8de
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Mar 16 02:18:05 2012 -0300

    Merge branch 'maint-2.3'

 build-scripts/config/dot_mozconfig        |    3 +++
 build-scripts/config/mozconfig-osx-i386   |    3 +++
 build-scripts/config/mozconfig-osx-x86_64 |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)