commit d0bb81a4518525860666f7ad19315d8164c74697 Merge: 5fe915d d2204b4 Author: Damian Johnson <ata...@torproject.org> Date: Mon Apr 4 15:22:31 2011 +0000
Arm version 1.4.2 release. svn:r24555 ChangeLog | 48 ++ README | 27 +- TODO | 281 --------- armrc.sample | 70 ++- src/interface/configPanel.py | 260 +++++---- src/interface/connPanel.py | 6 +- src/interface/connections/__init__.py | 6 + src/interface/connections/circEntry.py | 216 +++++++ src/interface/connections/connEntry.py | 864 ++++++++++++++++++++++++++++ src/interface/connections/connPanel.py | 398 +++++++++++++ src/interface/connections/entries.py | 183 ++++++ src/interface/controller.py | 236 ++++++--- src/interface/descriptorPopup.py | 2 +- src/interface/graphing/__init__.py | 2 +- src/interface/graphing/bandwidthStats.py | 26 +- src/interface/graphing/connStats.py | 4 +- src/interface/graphing/graphPanel.py | 21 +- src/interface/headerPanel.py | 27 +- src/interface/logPanel.py | 75 ++-- src/interface/torrcPanel.py | 16 +- src/settings.cfg | 365 ++++++++++++ src/starter.py | 44 +-- src/test.py | 46 ++- src/util/__init__.py | 2 +- src/util/conf.py | 23 +- src/util/connections.py | 341 ++++++++++-- src/util/enum.py | 116 ++++ src/util/log.py | 50 +-- src/util/panel.py | 92 +++- src/util/procTools.py | 20 +- src/util/sysTools.py | 4 +- src/util/torConfig.py | 138 +++-- src/util/torTools.py | 904 ++++++++++++++++++++++++++++-- src/util/uiTools.py | 135 ++++- src/version.py | 4 +- 35 files changed, 4249 insertions(+), 803 deletions(-) diff --cc src/version.py index a851658,f97b26d..a86b0bb --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """ - VERSION = '1.4.1.3' - LAST_MODIFIED = "January 15, 2011" -VERSION = '1.4.2_dev' -LAST_MODIFIED = "January 7, 2011" ++VERSION = '1.4.2' ++LAST_MODIFIED = "April 4, 2011" _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits