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

[ioerror at torproject.org]

commit 18ce925004eb3030b91c01beda43a58017607103
Merge: f76a57a fe239d1
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Aug 19 17:25:35 2011 +0200

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

 packages/torouter-web/src/tui/config.py            |    5 +-
 .../torouter-web/src/tui/controllers/network.py    |   12 +++++-
 packages/torouter-web/src/tui/controllers/tor.py   |   13 ++++--
 .../torouter-web/src/tui/utils/configuration.py    |   41 +++++++++++++++-----
 packages/torouter-web/src/tui/utils/fileio.py      |    8 ++--
 packages/torouter-web/src/tui/utils/parsing.py     |   38 ++++++++++++++++--
 6 files changed, 90 insertions(+), 27 deletions(-)