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

[hellais at torproject.org]

commit cab97f7c6fc7f3c70c0b92ef07466251f7faca9e
Merge: d7bbc0d b848fc8
Author: Arturo Filastò <hellais at torproject.org>
Date:   Wed Aug 17 17:25:38 2011 +0200

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

 packages/torouter-prep/configs/dnsmasq.conf        |  556 ++++++++++++++++++++
 packages/torouter-prep/configs/interfaces          |   38 ++
 packages/torouter-prep/configs/sources.list        |   14 +
 packages/torouter-prep/configs/sshd_config         |   87 +++
 .../torouter-prep/configs/tor-wireless-firewall.sh |   20 +
 packages/torouter-prep/configs/torrc               |  177 +++++++
 packages/torouter-prep/configs/udhcpd.conf         |   26 +
 packages/torouter-web/debian/README                |    6 +
 packages/torouter-web/debian/README.Debian         |    8 +
 packages/torouter-web/debian/changelog             |    5 +
 packages/torouter-web/debian/compat                |    1 +
 packages/torouter-web/debian/control               |   13 +
 packages/torouter-web/debian/copyright             |   36 ++
 packages/torouter-web/debian/dirs                  |    1 +
 packages/torouter-web/debian/postinst              |   39 ++
 packages/torouter-web/debian/postrm                |   37 ++
 packages/torouter-web/debian/preinst               |   35 ++
 packages/torouter-web/debian/prerm                 |   38 ++
 packages/torouter-web/debian/rules                 |    6 +
 packages/torouter-web/debian/source/format         |    1 +
 packages/torouter-web/debian/torouter-tui.default  |   10 +
 21 files changed, 1154 insertions(+), 0 deletions(-)