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

[chiiph at torproject.org]

commit 35bc87acd8227d5e29312c6c608eea3828d1845f
Merge: 3a6592f 7af8629
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Mon Mar 5 09:41:36 2012 -0300

    Merge branch 'bug5109_bootstrap_phase' into alpha
    
    Conflicts:
    	src/vidalia/MainWindow.cpp

 changes/bug5109                    |    2 +
 src/torcontrol/BootstrapStatus.cpp |   37 ++-----------------------------
 src/torcontrol/BootstrapStatus.h   |   25 ++------------------
 src/torcontrol/TorControl.cpp      |    4 +-
 src/torcontrol/TorEvents.cpp       |    2 +-
 src/vidalia/MainWindow.cpp         |   42 +-----------------------------------
 6 files changed, 12 insertions(+), 100 deletions(-)