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

[ioerror at torproject.org]

commit a56b3841d2adb8c995d6fe4603a7e7751bfa6d78
Merge: 2196124 f54fe96
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Sat Aug 13 04:39:04 2011 +0200

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

 packages/torouter-web/static/main.css            |   10 +++-
 packages/torouter-web/tui/controllers/network.py |   56 ++++++---------
 packages/torouter-web/tui/controllers/tor.py     |    4 +
 packages/torouter-web/tui/utils/configuration.py |   85 ++++++++++++++++++++++
 packages/torouter-web/tui/utils/parsing.py       |   66 +++++++++++++++++
 packages/torouter-web/tui/views/firewall.html    |    8 ++-
 packages/torouter-web/tui/views/wired.html       |    8 ++-
 7 files changed, 200 insertions(+), 37 deletions(-)