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

[ioerror at torproject.org]

commit 24b92ab9b034d6c957631a034a717ba41809a335
Merge: e5dbdcb ed08b56
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Wed Aug 17 17:59:37 2011 +0200

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

 packages/torouter-web/config.py                  |    2 +
 packages/torouter-web/tui/controllers/network.py |   10 ++++++-
 packages/torouter-web/tui/utils/parsing.py       |   27 +++++++++++++++++----
 packages/torouter-web/tui/views/status.html      |    4 ++-
 4 files changed, 35 insertions(+), 8 deletions(-)