- tor-commits - lists.torproject.org

[tor/master] Merge branch 'master' of ssh://git-rw.torproject.org/tor
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 4bbd6a27612e8e48c593dd0683294a980ecb8484 Merge: 9919b01 694cd7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 24 16:48:01 2011 -0400 Merge branch 'master' of ssh://git-rw.torproject.org/tor ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3456'
by nickm＠torproject.org 24 Jun '11

24 Jun '11

commit 0b536469ee8a6d437cd939cbcdaa56039e27cdcb Merge: 4bbd6a2 76d0d62 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 24 16:48:38 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3456' src/or/or.h | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)

1 0

r24838: {website} bump package versions for 0.2.2.29-beta (website/trunk/include)
by Erinn Clark 24 Jun '11

24 Jun '11

Author: erinn Date: 2011-06-24 20:06:17 +0000 (Fri, 24 Jun 2011) New Revision: 24838 Modified: website/trunk/include/versions.wmi Log: bump package versions for 0.2.2.29-beta Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-06-24 15:56:56 UTC (rev 24837) +++ website/trunk/include/versions.wmi 2011-06-24 20:06:17 UTC (rev 24838) @@ -2,24 +2,24 @@ <define-tag version-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.27-beta-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.9</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.9</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.27-beta</define-tag> -<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.10, zlib-1.2.3, openssl-0.9.8p</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> <define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.17</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.27-beta</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.27-1</define-tag> +<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0

[torflow/master] Fix permissions on bwauthority.py
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 35039739229c5ca58562fccd6d43f7efb3beb3d9 Author: aagbsn <aagbsn(a)extc.org> Date: Fri Jun 17 18:56:37 2011 -0700 Fix permissions on bwauthority.py --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py old mode 100644 new mode 100755

1 0

[torflow/master] Clean up imports
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit fdfa2e7ad6576effd429274e0369cdb2cc461ddb Author: aagbsn <aagbsn(a)extc.org> Date: Fri Jun 17 19:04:17 2011 -0700 Clean up imports --- NetworkScanners/BwAuthority/bwauthority.py | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index b1a6197..62f0658 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -1,14 +1,11 @@ #!/usr/bin/env python -import sys -import subprocess -import ConfigParser -import os -import traceback -sys.path.append("../../") -from TorCtl import TorUtil -from TorCtl.TorUtil import plog -from signal import signal, SIGTERM +from sys import argv as s_argv +from sys import path from sys import exit +from subprocess import Popen +path.append("../../") +from TorCtl.TorUtil import plog as plog +from signal import signal, SIGTERM # exit code to indicate scan completion @@ -20,7 +17,7 @@ def main(argv): while True: plog('INFO', 'Beginning time loop') global p - p = subprocess.Popen(["python", "bwauthority_child.py", argv[1], str(slice_num)]) + p = Popen(["python", "bwauthority_child.py", argv[1], str(slice_num)]) p.wait() if (p.returncode == 0): slice_num += 1 @@ -38,11 +35,9 @@ def sigterm_handler(signum, frame): if __name__ == '__main__': signal(SIGTERM, sigterm_handler) try: - main(sys.argv) + main(s_argv) except KeyboardInterrupt: p.kill() plog('INFO', "Ctrl + C was pressed. Exiting ... ") - traceback.print_exc() except Exception, e: plog('ERROR', "An unexpected error occured.") - traceback.print_exc()

1 0

[torflow/master] Return code should be positive, see sys.exit()
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit f4346a667801d7dee3c602cf02fe419ed1693031 Author: aagbsn <aagbsn(a)extc.org> Date: Sat Jun 18 16:04:39 2011 -0700 Return code should be positive, see sys.exit() --- NetworkScanners/BwAuthority/bwauthority.py | 2 +- NetworkScanners/BwAuthority/bwauthority_child.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index 62f0658..12eeab0 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -10,7 +10,7 @@ from signal import signal, SIGTERM # exit code to indicate scan completion # make sure to update this in bwauthority_child.py as well -STOP_PCT_REACHED = -9 +STOP_PCT_REACHED = 9 def main(argv): slice_num = 0 diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 4b09f9f..e8a0a68 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -76,7 +76,7 @@ __selmgr = PathSupport.SelectionManager( # exit code to indicate scan completion # make sure to update this in bwauthority.py as well -STOP_PCT_REACHED = -9 +STOP_PCT_REACHED = 9 def read_config(filename): config = ConfigParser.SafeConfigParser() @@ -309,6 +309,7 @@ def main(argv): plog('INFO', 'stop_pct: %s reached. Exiting with %s' % (stop_pct, STOP_PCT_REACHED)) sys.exit(STOP_PCT_REACHED) + plog("DEBUG", "Starting slice number %s" % slice_num) speedrace(hdlr, slice_num*pct_step + start_pct, (slice_num + 1)*pct_step + start_pct, circs_per_node, save_every, out_dir, max_fetch_time, sleep_start, sleep_stop, slice_num, min_streams, sql_file)

1 0

[torflow/master] Update submodule.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit cb4db2317437621a22531e84b8686fc28785f2bf Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 12:29:28 2011 -0700 Update submodule. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index af306b5..d0f593f 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit af306b53a668168ae92a6c919d4013b81d7e61ad +Subproject commit d0f593f2ae245e951323ff7fc3a65fa6a1f16b47

1 0

[torflow/master] Update bw file percentages again; remove python 2.5ism.
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 5cd1f2be2e370176bf13ce44ad2033367cba032a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 12:28:00 2011 -0700 Update bw file percentages again; remove python 2.5ism. --- NetworkScanners/BwAuthority/bwauthority_child.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index e8a0a68..c342f2e 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -50,13 +50,14 @@ user_agent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.37 # TODO: We'll also want to try to prefer pairing unmeasured nodes # together then, and use a different url set for them. # cutoff percent URL -urls = [(5, "https://38.229.70.2/16M"), # fbw 1499k..500k - (10, "https://38.229.70.2/8M"), # fbw 500k..350k - (20, "https://38.229.70.2/4M"), # fbw 350k..200k - (30, "https://38.229.70.2/2M"), # fbw 200k..128k - (50, "https://38.229.70.2/512k"), # fbw 128k..50k - (80, "https://38.229.70.2/256k"), # fbw 50k..26k - (100, "https://38.229.70.2/128k")] # fbw 26k..10k +urls = [(5, "https://38.229.70.2/8M"), # fbw 2000k..451k + (10, "https://38.229.70.2/4M"), # fbw 451k..275k + (20, "https://38.229.70.2/2M"), # fbw 275k..150k + (30, "https://38.229.70.2/1M"), # fbw 150k..100k + (40, "https://38.229.70.2/1M"), # fbw 100k..75k + (50, "https://38.229.70.2/512k"), # fbw 75k..50k + (80, "https://38.229.70.2/256k"), # fbw 50k..25k + (100, "https://38.229.70.2/128k")] # fbw 25k..10k # Do NOT modify this object directly after it is handed to PathBuilder @@ -376,6 +377,8 @@ if __name__ == '__main__': except KeyboardInterrupt: plog('INFO', "Ctrl + C was pressed. Exiting ... ") traceback.print_exc() + except SystemExit, e: + sys.exit(e) except Exception, e: plog('ERROR', "An unexpected error occured.") traceback.print_exc()

1 0

[torflow/master] Update submodule..
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 9f756249cf53985a944cb27bf7101d4ff7f369c3 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Jun 24 12:33:36 2011 -0700 Update submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index d0f593f..dc1cb9c 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit d0f593f2ae245e951323ff7fc3a65fa6a1f16b47 +Subproject commit dc1cb9ce39fd5c9c5ea50f542642130a44e71fee

1 0

[torflow/master] bwauthority parent should exit when child is killed
by mikeperry＠torproject.org 24 Jun '11

24 Jun '11

commit 0e32c07900b8722d67b338b00fd0c79d746b16a3 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jun 23 11:39:58 2011 -0700 bwauthority parent should exit when child is killed --- NetworkScanners/BwAuthority/bwauthority.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index 12eeab0..9125044 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -5,7 +5,7 @@ from sys import exit from subprocess import Popen path.append("../../") from TorCtl.TorUtil import plog as plog -from signal import signal, SIGTERM +from signal import signal, SIGTERM, SIGKILL # exit code to indicate scan completion @@ -24,6 +24,12 @@ def main(argv): elif (p.returncode == STOP_PCT_REACHED): plog('INFO', 'restarting from slice 0') slice_num = 0 + elif (abs(p.returncode) == SIGKILL): + plog('WARN', 'Child process recieved SIGKILL, exiting') + exit() + elif (abs(p.returncode) == SIGTERM): + plog('WARN', 'Child process recieved SIGTERM, exiting') + exit() else: plog('WARN', 'Child process returned %s' % p.returncode)

1 0