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

[chiiph at torproject.org]

commit 7c8c7f0b20850048767f0ca4093d92e9d5a59ee8
Merge: 88f5ee8 49c2f16
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Sun May 27 18:04:18 2012 -0300

    Merge branch '5519_torcontrol' into alpha

 changes/bug5519                      |    3 +
 changes/bug5519.2                    |    3 +
 src/torcontrol/ControlConnection.cpp |   31 +++++---
 src/torcontrol/ControlConnection.h   |    2 +
 src/torcontrol/ControlSocket.cpp     |  133 +++++++++++++++++++++++++---------
 src/torcontrol/ControlSocket.h       |   19 +++---
 6 files changed, 135 insertions(+), 56 deletions(-)