commit 881c67adcfb60bac79feeafd7d2a0ae6fd40408d Merge: 6cf4836 902455c Author: Damian Johnson atagar@torproject.org Date: Sun Sep 25 14:34:04 2011 -0700

Arm release 1.4.4

ChangeLog | 40 ++- README | 14 +- armrc.sample | 13 +- src/cli/__init__.py | 2 +- src/cli/configPanel.py | 10 +- src/cli/connections/__init__.py | 2 +- src/cli/connections/circEntry.py | 54 +-- src/cli/connections/connEntry.py | 61 +- src/cli/connections/connPanel.py | 103 +++- src/cli/connections/countPopup.py | 100 +++ src/cli/connections/descriptorPopup.py | 229 +++++++ src/cli/connections/entries.py | 13 +- src/cli/controller.py | 100 ++-- src/cli/descriptorPopup.py | 216 ------- src/cli/graphing/bandwidthStats.py | 13 +- src/cli/graphing/graphPanel.py | 2 +- src/cli/headerPanel.py | 88 ++- src/cli/interpretorPanel.py | 136 ++++ src/cli/logPanel.py | 27 +- src/cli/menu/item.py | 2 +- src/cli/menu/menu.py | 2 +- src/cli/wizard.py | 150 ++++- src/gui/arm.xml | 169 ++++-- src/gui/configPanel.py | 161 +++++ src/gui/connections/circEntry.py | 37 +- src/gui/connections/connEntry.py | 48 +- src/gui/connections/connPanel.py | 134 ++--- src/gui/controller.py | 32 +- src/gui/generalPanel.py | 25 +- src/gui/graphing/__init__.py | 2 +- src/gui/graphing/bandwidthStats.py | 12 +- src/gui/graphing/graphPanel.py | 144 +++++ src/gui/graphing/graphStats.py | 142 ----- src/gui/logPanel.py | 26 +- src/resources/arm.1 | 2 +- src/resources/torrcOverride/override.c | 50 ++ src/resources/torrcOverride/override.h | 1 + src/resources/torrcOverride/override.py | 363 +++++++++++ src/resources/torrcTemplate.txt | 2 +- src/settings.cfg | 6 + src/starter.py | 164 ++++- src/util/__init__.py | 2 +- src/util/connections.py | 4 +- src/util/gtkTools.py | 405 ++++++++++++ src/util/panel.py | 70 +-- src/util/textInput.py | 195 ++++++ src/util/torConfig.py | 40 +- src/util/torInterpretor.py | 1058 +++++++++++++++++++++++++++++++ src/util/torTools.py | 534 +++++++++++++++- src/util/uiTools.py | 67 -- src/version.py | 4 +- 51 files changed, 4302 insertions(+), 974 deletions(-)

diff --cc src/version.py index 1653b22,a1c26cf..f50af80 --- a/src/version.py +++ b/src/version.py @@@ -2,6 -2,6 +2,6 @@@ Provides arm's version and release date. """

- VERSION = '1.4.3' - LAST_MODIFIED = "July 16, 2011" -VERSION = '1.4.4_dev' -LAST_MODIFIED = "July 17, 2011" ++VERSION = '1.4.4' ++LAST_MODIFIED = "September 25, 2011"