commit d92bf67ec79ac110ef833bc4bccd9dede49ad2d6 Merge: 8d691c7 9406862 Author: Tomas Touceda chiiph@gentoo.org Date: Tue May 3 11:38:01 2011 -0300

Merge branch 'bug2835_getbridges'

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(-)