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

Fri Aug 19 08:51:36 UTC 2011

commit 11aaab578cc13910aca7a32d87072781056f30df
Merge: dfe11c7 e3327c3
Author: Arturo FilastoÌ€ <hellais at torproject.org>
Date:   Fri Aug 19 10:51:07 2011 +0200

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

 packages/Makefile                                  |   12 +-
 packages/dreamplug-uaputl/Makefile                 |   55 -
 .../dreamplug-uaputl/config/80211d_domain.conf     |   28 -
 packages/dreamplug-uaputl/config/pack.conf         |    1 -
 .../config/sample_cal_data_bg_8688.conf            |   42 -
 packages/dreamplug-uaputl/config/uapcoex.conf      |   21 -
 packages/dreamplug-uaputl/config/uaputl.conf       |   95 -
 packages/dreamplug-uaputl/debian/README            |    8 -
 packages/dreamplug-uaputl/debian/changelog         |    5 -
 packages/dreamplug-uaputl/debian/compat            |    1 -
 packages/dreamplug-uaputl/debian/control           |   15 -
 packages/dreamplug-uaputl/debian/copyright         |   28 -
 packages/dreamplug-uaputl/debian/dirs              |    1 -
 packages/dreamplug-uaputl/debian/rules             |   13 -
 packages/dreamplug-uaputl/debian/source/format     |    1 -
 packages/dreamplug-uaputl/uapcmd.c                 | 4704 -----------------
 packages/dreamplug-uaputl/uapcmd.h                 |   63 -
 packages/dreamplug-uaputl/uaputl.c                 | 5565 --------------------
 packages/dreamplug-uaputl/uaputl.h                 | 1289 -----
 packages/torouter-prep/Makefile                    |    2 +
 packages/torouter-prep/configs/047E6A24.asc        |   19 +
 ...3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.apt-key |  Bin 0 -> 3742 bytes
 .../configs/apt-preferences.d-backports            |    3 +
 packages/torouter-prep/configs/apt.conf            |    1 +
 packages/torouter-prep/configs/armrc.sample.gz     |  Bin 0 -> 3633 bytes
 packages/torouter-prep/configs/dnsmasq.conf        |    3 +-
 packages/torouter-prep/configs/inittab             |   70 +
 packages/torouter-prep/configs/interfaces          |   10 +-
 .../configs/modprobe.d-blacklist.conf              |   26 +
 packages/torouter-prep/configs/ntp.conf            |   55 +
 packages/torouter-prep/configs/sources.list        |    3 +
 packages/torouter-prep/configs/torrc               |   31 +-
 packages/torouter-prep/configs/ttdnsd-default      |   17 +
 packages/torouter-prep/debian/control              |    2 +-
 packages/torouter-prep/debian/dirs                 |    1 +
 packages/torouter-prep/src/torouter_config.sh      |  139 +-
 36 files changed, 283 insertions(+), 12046 deletions(-)