[tor-commits] [arm/release] Merging krkhan's master branch

[atagar at torproject.org]

commit 4f3c6b69ced8b25a522f740f522a2a3aac855b5b
Merge: 02be67a aef4158
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Jul 14 17:42:25 2011 -0700

    Merging krkhan's master branch

 src/gui/arm.xml                  |   79 ++----------------------
 src/gui/connections/__init__.py  |    6 ++
 src/gui/connections/circEntry.py |   41 +++++++++++++
 src/gui/connections/connEntry.py |   61 +++++++++++++++++++
 src/gui/connections/connPanel.py |  114 +++++++++++++++++++++++++++++++++++
 src/gui/controller.py            |   10 +++-
 src/gui/graphing/graphStats.py   |   15 +++--
 src/gui/logPanel.py              |   21 ++++--
 src/gui/stickyPanel.py           |  123 ++++++++++++++++++++++++++++++++++++++
 src/starter.py                   |    2 +-
 src/util/gtkTools.py             |   21 +++++++
 11 files changed, 406 insertions(+), 87 deletions(-)