[tor-commits] [torouter/master] pin to debian experimental for orport auto and so on

[ioerror at torproject.org]

commit aeaeb4b616c0d4c4b3c4a37f408a98e730304745
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Tue Aug 23 12:37:26 2011 +0200

    pin to debian experimental for orport auto and so on
---
 packages/torouter-prep/configs/torrc          |    4 ++--
 packages/torouter-prep/src/torouter_config.sh |    4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/torouter-prep/configs/torrc b/packages/torouter-prep/configs/torrc
index 29a9526..0979ddc 100644
--- a/packages/torouter-prep/configs/torrc
+++ b/packages/torouter-prep/configs/torrc
@@ -96,8 +96,8 @@ Nickname Torouter
 ## Define these to limit how much relayed traffic you will allow. Your
 ## own traffic is still unthrottled. Note that RelayBandwidthRate must
 ## be at least 20 KBytes.
-RelayBandwidthRate 50KB KBytes
-RelayBandwidthBurst 75KB KBytes
+RelayBandwidthRate 50KB
+RelayBandwidthBurst 75KB
 
 ## Contact info to be published in the directory, so we can contact you
 ## if your relay is misconfigured or something else goes wrong. Google
diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh
index 106ffc3..11956f9 100644
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@ -52,7 +52,7 @@ apt-get -y install denyhosts ufw
 apt-get -y -t squeeze-backports install openntpd
 
 # Install Tor and deps:
-apt-get -y install tor tor-geoipdb
+apt-get -y -t experimental-squeeze 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 +115,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