[tor-commits] [arm/release] Merge remote-tracking branch 'origin'

[atagar at torproject.org]

commit 68518b5a9e4210393777678124a9a6f597409305
Merge: 3f3cc61 52c50c8
Author: Kamran Riaz Khan <krkhan at inspirated.com>
Date:   Sat Jul 16 01:06:24 2011 +0500

    Merge remote-tracking branch 'origin'
    
    Conflicts:
    	src/gui/arm.xml

 armrc.sample                             |   12 +-
 src/cli/configPanel.py                   |    6 +
 src/cli/connections/connEntry.py         |    3 +
 src/cli/connections/connPanel.py         |    8 +-
 src/cli/controller.py                    |  162 +++++++++++-
 src/cli/graphing/bandwidthStats.py       |   10 +-
 src/cli/headerPanel.py                   |   22 ++-
 src/cli/logPanel.py                      |  110 +++++---
 src/cli/menu/actions.py                  |   10 +-
 src/cli/wizard.py                        |  449 +++++++++++++++++++++++++++++-
 src/resources/exitNotice/exit-noice.html |  143 ----------
 src/resources/exitNotice/index.html      |  143 ++++++++++
 src/resources/startTor                   |   28 ++
 src/resources/torrcTemplate.txt          |   90 ++++++
 src/settings.cfg                         |   28 ++-
 src/starter.py                           |   36 ++-
 src/util/panel.py                        |   11 +-
 src/util/torConfig.py                    |  142 ++++++++++
 src/util/torTools.py                     |   77 ++++--
 19 files changed, 1235 insertions(+), 255 deletions(-)