commit 02f40534d2d72d53128ce13bbc968bfaf21ad881 Merge: d1ccb6d dcdb261 Author: Tomás Touceda <chiiph@torproject.org> Date: Mon Mar 5 09:40:42 2012 -0300 Merge branch 'featNetworkMap' into alpha changes/featNetworkMap | 3 + cmake/FindGeoIP.cmake | 20 ++-- src/torcontrol/RouterDescriptor.cpp | 95 ++++++++++------ src/torcontrol/RouterDescriptor.h | 27 ++++- src/torcontrol/TorControl.cpp | 19 +++- src/torcontrol/TorControl.h | 2 + src/vidalia/CMakeLists.txt | 2 - src/vidalia/network/NetViewer.cpp | 53 ++++++-- src/vidalia/network/NetViewer.h | 25 +++- src/vidalia/network/RouterDescriptorView.cpp | 10 +- src/vidalia/network/RouterInfoDialog.cpp | 34 ++++- src/vidalia/network/RouterListItem.cpp | 2 + src/vidalia/network/TorMapWidget.cpp | 107 ++++++----------- src/vidalia/network/TorMapWidget.h | 7 +- src/vidalia/network/TorMapWidgetInputHandler.cpp | 138 ---------------------- src/vidalia/network/TorMapWidgetInputHandler.h | 55 --------- src/vidalia/network/TorMapWidgetPopupMenu.cpp | 37 ++---- src/vidalia/network/TorMapWidgetPopupMenu.h | 20 +--- 18 files changed, 270 insertions(+), 386 deletions(-)