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

[erinn at torproject.org]

commit 8b4c144be4445da48d8749c00475a48ce35a48f0
Merge: 022c82c dd8d5dc
Author: Erinn Clark <erinn at torproject.org>
Date:   Mon Oct 10 17:32:55 2011 +0100

    Merge branch 'bug4192' into maint-2.2

 ...owser-exit-when-not-launched-from-Vidalia.patch |   46 ++++++++++++++++++++
 1 files changed, 46 insertions(+), 0 deletions(-)