diff options
author | Arturo FilastoĢ <hellais@torproject.org> | 2011-08-23 12:24:22 +0200 |
---|---|---|
committer | Arturo FilastoĢ <hellais@torproject.org> | 2011-08-23 12:24:22 +0200 |
commit | 9b11ad9654554273bb77df4152e6de6912c19a6f (patch) | |
tree | 8f52e23d547ece67abd0cd908a8d79c43aeab1cf | |
parent | 1e8a3c15a00cc7e44f3d746fca8e65c18b8245b5 (diff) | |
parent | ecd17f3cba8317e69bd7757a1f6619db4091fd65 (diff) | |
download | torouter-9b11ad9654554273bb77df4152e6de6912c19a6f.tar.gz torouter-9b11ad9654554273bb77df4152e6de6912c19a6f.zip |
Merge branch 'master' of ssh://git-rw.torproject.org/torouter
-rw-r--r-- | packages/torouter-prep/configs/torrc | 4 | ||||
-rw-r--r-- | packages/torouter-prep/src/torouter_config.sh | 2 |
2 files changed, 3 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..3b72511 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 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... |