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

[chiiph@xxxxxxxxxxxxxx]

commit 3a6592f942f829f984078398e4f36ca117c912a6
Merge: 02f4053 460c177
Author: Tomás Touceda <chiiph@xxxxxxxxxxxxxx>
Date:   Mon Mar 5 09:40:48 2012 -0300

    Merge branch 'featAsyncControl' into alpha

 changes/featAsyncControl             |    2 +
 src/torcontrol/ControlConnection.cpp |   98 +++++++++++-----------------------
 src/torcontrol/ControlConnection.h   |    3 +-
 src/torcontrol/SendCommandEvent.cpp  |   18 +-----
 src/torcontrol/TorControl.cpp        |    4 ++
 src/vidalia/MainWindow.cpp           |   56 +++++++++----------
 6 files changed, 69 insertions(+), 112 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits