commit 525766e515148f9da5e78d39d1905264a4d14bad Merge: d435505 24b92ab Author: Arturo Filastò hellais@torproject.org Date: Wed Aug 17 18:16:55 2011 +0200

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

packages/Makefile | 9 +++++++++ packages/torouter-prep/configs/hostname | 1 + packages/torouter-prep/configs/hosts | 1 + packages/torouter-prep/debian/changelog | 2 +- packages/torouter-prep/debian/control | 2 +- packages/torouter-prep/debian/files | 2 +- packages/torouter-prep/src/torouter_config.sh | 3 ++- 7 files changed, 16 insertions(+), 4 deletions(-)