commit 3f79f47e553e6b55fa5771b262a5cf9dad08f4fc Merge: 36fae04 428c94e Author: Damian Johnson atagar@torproject.org Date: Thu Oct 7 05:06:02 2010 +0000

Merging trunk for release 1.3.7.

svn:r23439

ChangeLog | 55 ++- README | 85 +- TODO | 194 +++-- arm | 13 +- armrc.sample | 83 +-- debian/MANIFEST | 40 + debian/arm.1.gz | Bin 0 -> 1115 bytes debian/changelog | 5 + 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 + init/__init__.py | 6 - init/prereq.py | 23 - init/project113.py | 192 ---- init/starter.py | 180 ---- install | 15 + interface/__init__.py | 6 - interface/confPanel.py | 252 ------ interface/connPanel.py | 910 ------------------- interface/controller.py | 1290 --------------------------- interface/descriptorPopup.py | 181 ---- interface/fileDescriptorPopup.py | 189 ---- interface/graphing/__init__.py | 6 - interface/graphing/bandwidthStats.py | 348 -------- interface/graphing/connStats.py | 51 -- interface/graphing/graphPanel.py | 363 -------- interface/graphing/psStats.py | 129 --- interface/headerPanel.py | 349 -------- interface/logPanel.py | 466 ---------- screenshot_page1.png | Bin 110363 -> 0 bytes screenshot_page2.png | Bin 146134 -> 0 bytes setup.py | 29 + src/__init__.py | 6 + src/armrc.defaults | 229 +++++ src/interface/__init__.py | 6 + src/interface/confPanel.py | 292 ++++++ src/interface/connPanel.py | 954 ++++++++++++++++++++ src/interface/controller.py | 1412 ++++++++++++++++++++++++++++++ src/interface/descriptorPopup.py | 181 ++++ src/interface/fileDescriptorPopup.py | 189 ++++ src/interface/graphing/__init__.py | 6 + src/interface/graphing/bandwidthStats.py | 373 ++++++++ src/interface/graphing/connStats.py | 54 ++ src/interface/graphing/graphPanel.py | 408 +++++++++ src/interface/graphing/psStats.py | 141 +++ src/interface/headerPanel.py | 365 ++++++++ src/interface/logPanel.py | 1067 ++++++++++++++++++++++ src/prereq.py | 23 + src/starter.py | 182 ++++ src/uninstall | 16 + src/util/__init__.py | 8 + src/util/conf.py | 274 ++++++ src/util/connections.py | 371 ++++++++ src/util/hostnames.py | 391 +++++++++ src/util/log.py | 196 +++++ src/util/panel.py | 429 +++++++++ src/util/sysTools.py | 176 ++++ src/util/torTools.py | 888 +++++++++++++++++++ src/util/uiTools.py | 308 +++++++ src/version.py | 7 + util/__init__.py | 8 - util/conf.py | 246 ------ util/connections.py | 368 -------- util/hostnames.py | 388 -------- util/log.py | 195 ---- util/panel.py | 418 --------- util/sysTools.py | 172 ---- util/torTools.py | 877 ------------------- util/uiTools.py | 240 ----- 76 files changed, 9398 insertions(+), 8053 deletions(-)

diff --cc src/version.py index 0000000,1a7ddeb..dc41d36 mode 000000,100644..100644 --- a/src/version.py +++ b/src/version.py @@@ -1,0 -1,7 +1,7 @@@ + """ + Provides arm's version and release date. + """ + -VERSION = '1.3.7_dev' ++VERSION = '1.3.7' + LAST_MODIFIED = "October 6, 2010" +