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

[ioerror at torproject.org]

commit b18611fa5a246c254074c4f38229f55acedff3b6
Merge: 8f7c217 2ec2f16
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Aug 19 15:54:52 2011 +0200

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

 packages/torouter-web/src/runui.py            |    2 +-
 packages/torouter-web/src/tui/config.py       |   17 +++++++++++++++++
 packages/torouter-web/src/tui/utils/fileio.py |   11 +++++++----
 packages/torouter-web/src/tui/view.py         |   11 +++++++++++
 4 files changed, 36 insertions(+), 5 deletions(-)