15 Mar
2012
15 Mar
'12
2:15 p.m.
commit 6fa82f268a15d81cffd325e2cdabb7cfe07e6618 Merge: d7c2674 b836b71 Author: Tomás Touceda <chiiph@torproject.org> Date: Thu Mar 15 11:13:05 2012 -0300 Merge branch 'featImprovedBootstrap' into alpha changes/featImprovedBootstrap | 1 + src/torcontrol/ControlConnection.cpp | 42 +++--- src/torcontrol/TorControl.cpp | 83 +++++++++- src/torcontrol/TorControl.h | 45 ++++-- src/torcontrol/TorProcess.cpp | 28 ++-- src/vidalia/MainWindow.cpp | 295 +++++++++++++++++++++------------- src/vidalia/MainWindow.h | 16 +- 7 files changed, 343 insertions(+), 167 deletions(-)