[tor-commits] [torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter

[ioerror at torproject.org]

commit 254d2d3f6d1dfc01481ae4158302aae306bef793
Merge: d891a6d 21472ff
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Aug 19 15:09:45 2011 +0200

    Merge branch 'master' of ssh://git-rw.torproject.org/torouter

 packages/torouter-web/setup.py                     |    5 ++-
 packages/torouter-web/src/config.py                |   16 ---------------
 packages/torouter-web/src/runui.py                 |    2 +-
 packages/torouter-web/src/tui/controllers/main.py  |    5 ++-
 .../torouter-web/src/tui/controllers/network.py    |    5 ++-
 packages/torouter-web/src/tui/controllers/tor.py   |   21 +++++++++++++++----
 .../torouter-web/src/tui/models/router_config.py   |    2 +-
 .../torouter-web/src/tui/utils/configuration.py    |    5 +++-
 packages/torouter-web/src/tui/utils/fileio.py      |   21 ++++++++++++++++++++
 packages/torouter-web/src/tui/utils/parsing.py     |    7 ++++++
 packages/torouter-web/src/tui/utils/session.py     |    2 +-
 packages/torouter-web/src/tui/views/torconfig.html |   12 ++++++++++-
 packages/torouter-web/src/tui/views/torstatus.html |    2 +
 packages/torouter-web/src/view.py                  |   11 ----------
 14 files changed, 73 insertions(+), 43 deletions(-)