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

Tue Jun 12 13:21:18 UTC 2012

commit ecf45324bec86c7c1a3a2b2ceb3ac441734cadda
Merge: be9059d d7786e7
Author: TomÃ¡s Touceda <chiiph at torproject.org>
Date:   Sat Jun 9 14:35:35 2012 -0300

    Merge branch 'pickExitNodes' into alpha

 changes/pickExitNodes                    |    9 ++++
 src/torcontrol/TorControl.cpp            |    7 ++-
 src/vidalia/VMessageBox.cpp              |    2 +-
 src/vidalia/config/AdvancedPage.cpp      |    6 ++-
 src/vidalia/config/TorSettings.cpp       |   50 +++++++++++++++++---
 src/vidalia/config/TorSettings.h         |    5 ++
 src/vidalia/config/VidaliaSettings.cpp   |   13 +++++
 src/vidalia/config/VidaliaSettings.h     |   10 ++++-
 src/vidalia/network/NetViewer.cpp        |    2 +
 src/vidalia/network/RouterListItem.cpp   |   57 ++++++++++++++++++++++
 src/vidalia/network/RouterListItem.h     |   13 +++++
 src/vidalia/network/RouterListWidget.cpp |   75 +++++++++++++++++++++++++++++-
 src/vidalia/network/RouterListWidget.h   |    7 +++
 13 files changed, 241 insertions(+), 15 deletions(-)