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

[hellais at torproject.org]

commit 21472ffb02bb44782d232ce5efe79042c8cb27c6
Merge: e4d842c 7c28ada
Author: Arturo Filastò <hellais at torproject.org>
Date:   Fri Aug 19 15:22:43 2011 +0200

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

 packages/torouter-prep/configs/openntpd-default |    6 ++++++
 packages/torouter-prep/configs/sources.list     |    3 +++
 packages/torouter-prep/src/torouter_config.sh   |    1 +
 packages/torouter-web/src/runui.py              |    1 +
 packages/torouter_easy_setup.sh                 |    8 ++++++++
 5 files changed, 19 insertions(+), 0 deletions(-)