[tor-commits] [arm/release] Merge branch 'master' of git://git.torproject.org/arm

[atagar at torproject.org]

commit 4b6aec8aa755a810ab1baf1575e4566ace394d7f
Merge: 05a369b 7ec67a3
Author: Kamran Riaz Khan <krkhan at inspirated.com>
Date:   Tue Jul 5 15:26:45 2011 +0500

    Merge branch 'master' of git://git.torproject.org/arm

 README                                           |    3 +-
 arm.1                                            |   74 --
 armrc.sample                                     |    8 +
 setup.py                                         |   29 +-
 src/cli/__init__.py                              |    2 +-
 src/cli/configPanel.py                           |   31 +-
 src/cli/connections/circEntry.py                 |    4 +
 src/cli/connections/connPanel.py                 |    2 +-
 src/cli/controller.py                            |   28 +-
 src/cli/graphing/bandwidthStats.py               |    2 +-
 src/cli/graphing/connStats.py                    |    2 +-
 src/cli/headerPanel.py                           |   29 +-
 src/cli/logPanel.py                              |   19 +-
 src/cli/menu/actions.py                          |    2 +
 src/cli/menu/menu.py                             |    1 +
 src/cli/popups.py                                |    2 +-
 src/cli/torrcPanel.py                            |   12 +-
 src/cli/wizard.py                                |  495 ++++++++++
 src/prereq.py                                    |    6 +-
 src/resources/arm.1                              |   74 ++
 src/resources/exitNotice/exit-noice.html         |  143 +++
 src/resources/exitNotice/how_tor_works_thumb.png |  Bin 0 -> 8147 bytes
 src/resources/torConfigDesc.txt                  | 1123 ++++++++++++++++++++++
 src/settings.cfg                                 |  368 ++++++--
 src/starter.py                                   |   83 +-
 src/torConfigDesc.txt                            | 1123 ----------------------
 src/util/panel.py                                |   53 +-
 src/util/torConfig.py                            |   22 +-
 src/util/torTools.py                             |   28 +-
 src/util/uiTools.py                              |   47 +-
 30 files changed, 2441 insertions(+), 1374 deletions(-)