commit 5c61f445926f1420f61e509cea51dc7a24e1b0b5 Merge: 3dd720f b540393 Author: Jacob Appelbaum jacob@appelbaum.net Date: Tue Aug 23 15:20:12 2011 +0200

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

packages/torouter-web/setup.py | 6 +- packages/torouter-web/src/runui.py | 2 +- packages/torouter-web/src/tui/view.py | 5 ++- packages/torouter-web/src/tui/views/base.html | 55 ++++++++++++++++++++++++- 4 files changed, 62 insertions(+), 6 deletions(-)