- tor-commits - lists.torproject.org

[torouter/master] Remove the sys.argv hack from one of the cases
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 8c342073f62fceece5cd484c78ad1c60ad6c36bd Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:47:42 2011 +0200 Remove the sys.argv hack from one of the cases --- packages/torouter-web/src/runui.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/src/runui.py b/packages/torouter-web/src/runui.py index 4353475..b016ea9 100644 --- a/packages/torouter-web/src/runui.py +++ b/packages/torouter-web/src/runui.py @@ -55,7 +55,6 @@ if __name__ == "__main__": sys.exit(2) sys.exit(0) else: - sys.argv[1] = '8080' print "starting daemon..." service.start()

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit cc1981d0e85f2e640ba6a9f6f9e57bbca323dccf Merge: 8c34207 9e05744 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:48:30 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/src/torouter_config.sh | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[torouter/master] pin to debian experimental for orport auto and so on
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit aeaeb4b616c0d4c4b3c4a37f408a98e730304745 Author: Jacob Appelbaum <jacob(a)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

1 0

[torouter/master] add 0.2.2.x and 0.2.3.x
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit 2abcf4d43d03a6872f789c5e91208237249e7572 Merge: aeaeb4b 9b11ad9 Author: Jacob Appelbaum <jacob(a)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...

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 23 Aug '11

23 Aug '11

commit 9e05744e623c0956e06f066429ac05b9ccdf2763 Merge: 2abcf4d 218c5ca Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Tue Aug 23 12:41:10 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[torouter/master] Fix typo
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 218c5ca0ba055ba634a7f6b3c193bed18d57419e Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:39:55 2011 +0200 Fix typo --- packages/torouter-web/setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py index f505f38..fe3e6e8 100644 --- a/packages/torouter-web/setup.py +++ b/packages/torouter-web/setup.py @@ -13,5 +13,5 @@ setup(name='torouter-tui', author='Arturo Filasto', author_email='hellais(a)torproject.org', url='https://www.torproject.org/', - scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py', 'src/tui/daemon.py']) + scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py', 'src/daemon.py'])

1 0

[torouter/master] Add daemon to setup.py
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 1e8a3c15a00cc7e44f3d746fca8e65c18b8245b5 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:23:35 2011 +0200 Add daemon to setup.py --- packages/torouter-web/setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/packages/torouter-web/setup.py b/packages/torouter-web/setup.py index 2ff99fa..f505f38 100644 --- a/packages/torouter-web/setup.py +++ b/packages/torouter-web/setup.py @@ -13,5 +13,5 @@ setup(name='torouter-tui', author='Arturo Filasto', author_email='hellais(a)torproject.org', url='https://www.torproject.org/', - scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py']) + scripts=['src/runui.py', 'src/tui/view.py', 'src/tui/config.py', 'src/tui/daemon.py'])

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 23 Aug '11

23 Aug '11

commit 9b11ad9654554273bb77df4152e6de6912c19a6f Merge: 1e8a3c1 ecd17f3 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 23 12:24:22 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/torrc | 4 ++-- packages/torouter-prep/src/torouter_config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[torouter/master] We want tor 0.2.2, so use experimental
by runa＠torproject.org 23 Aug '11

23 Aug '11

commit ecd17f3cba8317e69bd7757a1f6619db4091fd65 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Aug 23 11:21:54 2011 +0100 We want tor 0.2.2, so use experimental --- packages/torouter-prep/src/torouter_config.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 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...

1 0

[torouter/master] Fix typo in torrc for RelayBandwidthRate and RelayBandwidthBurst
by runa＠torproject.org 23 Aug '11

23 Aug '11

commit a0ae9b97d97b1a69de289bbb011a499e5bad8671 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Aug 23 10:56:56 2011 +0100 Fix typo in torrc for RelayBandwidthRate and RelayBandwidthBurst --- packages/torouter-prep/configs/torrc | 4 ++-- 1 files changed, 2 insertions(+), 2 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

1 0