[tor-commits] [vidalia/alpha] Merge branch 'master' into alpha

[chiiph at torproject.org]

commit ec69a3999aed791d0a529f4c1ec283e1ead3f9f0
Merge: 8941866 d92bf67
Author: Tomas Touceda <chiiph at gentoo.org>
Date:   Tue May 3 11:38:12 2011 -0300

    Merge branch 'master' into alpha

 src/vidalia/Vidalia.cpp                            |    9 +++
 src/vidalia/config/BridgeDownloader.cpp            |   64 ++++++++------------
 src/vidalia/config/BridgeDownloader.h              |   17 ++---
 .../config/BridgeDownloaderProgressDialog.cpp      |    2 +-
 .../config/BridgeDownloaderProgressDialog.h        |    2 +-
 src/vidalia/config/NetworkPage.cpp                 |    4 +-
 src/vidalia/res/DigiCertAssuredCA.crt              |   22 +++++++
 src/vidalia/res/DigiCertCA.crt                     |   22 +++++++
 src/vidalia/res/DigiCertHighAssuranceCA.crt        |   23 +++++++
 src/vidalia/res/vidalia.qrc                        |    3 +
 10 files changed, 116 insertions(+), 52 deletions(-)