commit 73b830c7244046c4d1a9b32004a6ec18afd99d92 Merge: 0fb54f1 5e40918 Author: Arturo Filastò hellais@torproject.org Date: Fri Aug 19 17:27:47 2011 +0200

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

packages/torouter-prep/configs/sources.list | 5 +++-- packages/torouter-prep/configs/torrc | 9 ++++----- packages/torouter-prep/src/torouter_config.sh | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-)