[tor-commits] [torouter/master] add 0.2.2.x and 0.2.3.x

[ioerror at torproject.org]

commit 2abcf4d43d03a6872f789c5e91208237249e7572
Merge: aeaeb4b 9b11ad9
Author: Jacob Appelbaum <jacob at appelbaum.net>
Date:   Tue Aug 23 12:40:58 2011 +0200

    add 0.2.2.x and 0.2.3.x

 packages/torouter-prep/src/torouter_config.sh |    6 ++++--
 packages/torouter-web/setup.py                |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --cc packages/torouter-prep/src/torouter_config.sh
index 11956f9,3b72511..36e0677
--- a/packages/torouter-prep/src/torouter_config.sh
+++ b/packages/torouter-prep/src/torouter_config.sh
@@@ -51,8 -51,8 +51,10 @@@ apt-get -y install denyhosts uf
  # Allow us to set the clock:
  apt-get -y -t squeeze-backports install openntpd
  
--# Install Tor and deps:
- apt-get -y -t experimental-squeeze install tor tor-geoipdb
++# 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...