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

[ioerror at torproject.org]

commit d4b0267763c7501b855daffba8c9aa6ce61f462e
Merge: 5e49b4a 11aaab5
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Fri Aug 19 10:59:57 2011 +0200

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

 packages/torouter-web/src/static/main.css          |    5 +++++
 .../torouter-web/src/tui/controllers/network.py    |    4 ++--
 packages/torouter-web/src/tui/utils/parsing.py     |    1 +
 3 files changed, 8 insertions(+), 2 deletions(-)