[tor-commits] [arm/master] Merging to release for version 1.4.0

[sebastian at torproject.org]

commit f403cccb5119e4290c5dce370249f2cade3b7617
Merge: 76dcdd2 c43410c
Author: Damian Johnson <atagar at torproject.org>
Date:   Sun Nov 28 10:58:57 2010 +0000

    Merging to release for version 1.4.0
    
    
    
    svn:r23873

 ChangeLog                                |   46 ++-
 README                                   |   19 +-
 TODO                                     |  103 +++---
 arm                                      |    4 +-
 arm.1                                    |   73 ++++
 armrc.sample                             |  228 ++++++++++-
 debian/MANIFEST                          |   40 --
 debian/arm.1.gz                          |  Bin 1115 -> 0 bytes
 debian/changelog                         |   17 -
 debian/compat                            |    1 -
 debian/control                           |   28 --
 debian/copyright                         |   27 --
 debian/make-deb                          |   21 -
 debian/make-rpm                          |   21 -
 debian/manpages                          |    1 -
 debian/pycompat                          |    1 -
 debian/rules                             |   23 -
 debian/setup.cfg                         |    3 -
 debian/source/format                     |    1 -
 install                                  |    4 +-
 setup.py                                 |   60 +++-
 src/armrc.defaults                       |  229 -----------
 src/interface/__init__.py                |    2 +-
 src/interface/confPanel.py               |  292 -------------
 src/interface/configPanel.py             |  312 ++++++++++++++
 src/interface/connPanel.py               |    3 +-
 src/interface/controller.py              |  657 +++++++++++++++++++++++-------
 src/interface/graphing/bandwidthStats.py |    3 +-
 src/interface/graphing/graphPanel.py     |   10 +-
 src/interface/graphing/psStats.py        |    2 +-
 src/interface/headerPanel.py             |    3 +-
 src/interface/logPanel.py                |  126 ++++--
 src/interface/torrcPanel.py              |  221 ++++++++++
 src/settings.cfg                         |  130 ++++++
 src/starter.py                           |  162 ++++++--
 src/uninstall                            |    2 +-
 src/util/__init__.py                     |    2 +-
 src/util/conf.py                         |  222 +++++++----
 src/util/connections.py                  |    2 +-
 src/util/hostnames.py                    |   10 +-
 src/util/log.py                          |    8 +-
 src/util/panel.py                        |   96 ++++-
 src/util/sysTools.py                     |   20 +
 src/util/torConfig.py                    |  659 ++++++++++++++++++++++++++++++
 src/util/torTools.py                     |  170 +++++++-
 src/util/uiTools.py                      |  181 ++++++++-
 src/version.py                           |    4 +-
 47 files changed, 3091 insertions(+), 1158 deletions(-)

diff --cc TODO
index 6b0fe37,c5fe109..fa9d6ad
--- a/TODO
+++ b/TODO
@@@ -35,17 -28,26 +28,35 @@@ TOD
          - pick apart applications like iftop and pktstat to see how they get
            per-connection bandwidth usage. Forum thread discussing it:
            https://bbs.archlinux.org/viewtopic.php?pid=715906
-         - give usage stats for exit port usage (popup?)
-         - country data for client connections (requested by ioerror)
+       [ ] control port interpreter (interactive prompt)
+           Panel and startup option (-t maybe?) for providing raw control port
+           access along with usability improvements (piggybacking on the arm
+           connection):
+           - irc like help (ex "/help GETINFO" could provide a summary of
+             getinfo commands, partly using the results from
+             "GETINFO info/names")
+           - tab completion and up/down for previous commands
+           - warn and get confirmation if command would disrupt arm (for
+             instance 'SETEVENTS')
+           - 'safe' option that restricts to read-only access (start with this)
+           - issue sighup reset
+       [ ] low hanging fruit from the "client mode use cases" below
+   * release prep
+     * pylint --indent-string="  " --disable=C,R interface/foo.py | less
+     * double check __init__.py and README for changes
+ 
+ - Roadmap for version 1.4.2
+   [ ] refactor panels
+       [ ] controller and popup panels
 +      [ ] attempt to clear controller password from memory
 +        - http://www.codexon.com/posts/clearing-passwords-in-memory-with-python
 +  * release prep
 +    * pylint --indent-string="  " --disable=C,R interface/foo.py | less
 +    * double check __init__.py and README for changes
 +
 +- Roadmap for version 1.3.9
 +  [ ] refactor panels
 +      [ ] controller and popup panels
          - allow arm to resume after restarting tor
              This requires a full move to the torTools controller.
          - provide measurements for startup time, and try to improve bottlenecks
diff --cc src/version.py
index 08989e3,0b32fbf..a35c4ee
--- a/src/version.py
+++ b/src/version.py
@@@ -2,6 -2,6 +2,6 @@@
  Provides arm's version and release date.
  """
  
- VERSION = '1.3.7-1'
- LAST_MODIFIED = "October 7, 2010"
 -VERSION = '1.4.0_dev'
++VERSION = '1.4.0'
+ LAST_MODIFIED = "November 27, 2010"