aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo FilastoĢ€ <hellais@torproject.org>2011-08-23 12:48:30 +0200
committerArturo FilastoĢ€ <hellais@torproject.org>2011-08-23 12:48:30 +0200
commitcc1981d0e85f2e640ba6a9f6f9e57bbca323dccf (patch)
tree4c54c74d501e9f7bb31887c487cf641811873cb6
parent8c342073f62fceece5cd484c78ad1c60ad6c36bd (diff)
parent9e05744e623c0956e06f066429ac05b9ccdf2763 (diff)
downloadtorouter-cc1981d0e85f2e640ba6a9f6f9e57bbca323dccf.tar.gz
torouter-cc1981d0e85f2e640ba6a9f6f9e57bbca323dccf.zip
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
-rw-r--r--packages/torouter-prep/src/torouter_config.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index 3b72511..36e0677 100644
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -51,8 +51,10 @@ apt-get -y install denyhosts ufw
# Allow us to set the clock:
apt-get -y -t squeeze-backports install openntpd
-# Install Tor and deps:
+# Install Tor and deps from Debian experimental to get 0.2.2.x for ORPort auto:
apt-get -y -t experimental install tor tor-geoipdb
+# To try the arm builds of 0.2.3.x do this:
+#apt-get -y -t torrouter install tor tor-geoipdb
# To build a 0.2.3.x Tor:
# apt-get source tor=0.2.3.1-alpha-1~~squeeze+1
# Debuild here...
@@ -115,6 +117,8 @@ cp $config_dir/ttdnsd-default /etc/default/ttdnsd
cp $config_dir/sshd_config /etc/ssh/sshd_config
# Clean up our cache
+apt-get -y polipo
+apt-get -y autoremove
apt-get -y clean
## Disable ipv6 support for now