commit fb4546cfd1ab55341508271faeb556bab9c39f14 Merge: cc9579c 6caf641 Author: Jacob Appelbaum jacob@appelbaum.net Date: Mon Aug 22 13:27:03 2011 +0200

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

packages/torouter_easy_setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --cc packages/torouter_easy_setup.sh index 2d65481,2d65481..f5bf6c5 --- a/packages/torouter_easy_setup.sh +++ b/packages/torouter_easy_setup.sh @@@ -30,7 -30,7 +30,7 @@@ deb http://torrouter.torproject.org/tor EOF

apt-key add /tmp/torouter-repo.key --apt-get update ++apt-get update --fix-missing apt-get install -t torrouter -y torouter-prep

echo "We're going to trash your system now; you have 30 seconds to bail out!"