commit 3a16b0dcdc37e42116d3d0b1555a5aea9e2b9ee0 Merge: 264fcce 12d4e66 Author: Tomás Touceda <chiiph@torproject.org> Date: Mon Jan 23 11:05:50 2012 -0300 Merge branch 'bug3463_takeownership' into alpha changes/bug3463 | 3 +++ src/torcontrol/TorControl.cpp | 7 +++++++ src/torcontrol/TorControl.h | 3 +++ src/vidalia/MainWindow.cpp | 7 +++++++ 4 files changed, 20 insertions(+), 0 deletions(-)