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

[erinn at torproject.org]

commit bd9992349beca70bcded8b60c63bbc211741f049
Merge: 203c742 ef26306
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Jun 6 22:02:52 2012 -0300

    Merge branch 'maint-2.2' into maint-2.3

 build-scripts/config/vidalia.conf.ff-osx |   14 +++++++-------
 build-scripts/osx.mk                     |    5 ++++-
 build-scripts/windows.mk                 |    2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)